From: David Galloway <dgallowa@redhat.com>
Date: Wed, 23 Feb 2022 15:04:34 +0000 (-0500)
Subject: ceph-dev-cron: Drop nautilus | Add quincy
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58262d7537612e245709b559bc0e5b2d0e78d032;p=ceph-build.git

ceph-dev-cron: Drop nautilus | Add quincy

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index ddd93189..10183530 100644
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -30,19 +30,19 @@
           browser: auto
           branches:
             - origin/master
+            - origin/quincy
             - origin/pacific
             - origin/octopus
-            - origin/nautilus
           skip-tag: true
           timeout: 20
           wipe-workspace: true
 
     builders:
-      # Build luminous on:
-      # default: centos7 bionic xenial trusty
+      # build octopus on:
+      # default: focal bionic centos7 centos8 leap15
       - conditional-step:
           condition-kind: regex-match
-          regex: .*luminous.*
+          regex: .*octopus.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -55,12 +55,13 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=centos7 bionic xenial trusty
-      # build nautilus on:
-      # default: bionic xenial centos7 centos8
+                    DISTROS=focal bionic centos7 centos8 leap15
+      # build pacific on:
+      # default: focal bionic centos8 leap15
+      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*nautilus.*
+          regex: .*pacific.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -73,31 +74,20 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=bionic xenial centos7 centos8
-      # build octopus on:
-      # default: focal bionic centos7 centos8 leap15
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*octopus.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
+                    DISTROS=focal bionic centos8 leap15
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos7 centos8 leap15
-      # build pacific on:
-      # default: focal bionic centos8 leap15
+                    DISTROS=centos8
+                    FLAVOR=crimson
+                    ARCHS=x86_64
+      # build quincy on:
+      # default: focal centos8 leap15
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*pacific.*
+          regex: .*quincy.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -110,7 +100,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8 leap15
+                    DISTROS=focal centos8 leap15
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}