add quincy targets

Fixes: https://tracker.ceph.com/issues/54134
Signed-off-by: Vikhyat Umrao <vikhyat@redhat.com>

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index fa7f4071be54c2d721ff8214af56df25851cf895..e6548c389bf5558a554fcc0ea6b68b48c8ce0b6b 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -62,7 +62,7 @@
             - condition-kind: and
               condition-operands:
                 - condition-kind: regex-match
-                  regex: (mimic|nautilus|octopus|pacific)
+                  regex: (mimic|nautilus|octopus|pacific|quincy)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
                   regex: (xenial|bionic|focal|centos7|centos8|buster|bullseye)

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index 061cd4468f92187cd5b5359137fba6752488d0bb..40528314a7aaa3d329053e8445095fb39f461bd1 100644 (file)
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -126,12 +126,38 @@
                     DISTROS=centos8
                     FLAVOR=crimson
                     ARCHS=x86_64
+      # build quincy on:
+      # default: focal centos8 leap15
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*quincy.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=focal centos8 leap15
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+                    ARCHS=x86_64
       # If no release name is found in branch, build on all possible distro/flavor combos (except xenial and bionic).
       # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is.
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|crimson-only\|jaeger\)'
+            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|crimson-only\|jaeger\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 04d274617df8540ee649fde2d63a0102eeea9335..2405e3a2868be3e93fdafa9a4d4b510ddfdc6092 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -34,6 +34,7 @@
             - 'origin/nautilus'
             - 'origin/octopus'
             - 'origin/pacific'
+            - 'origin/quincy'
           skip-tag: true
           timeout: 20
           wipe-workspace: true
@@ -100,6 +101,31 @@
                     FORCE=True
                     DISTROS=centos8
                     FLAVOR=crimson
+      # build quincy on:
+      # default: focal centos8 leap15
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*quincy.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=focal centos8 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
       # build master on:
       # default: focal centos8
       # crimson: centos8

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index 731a19a0675c3a69bc9c09d7cb25f5c3c89416dd..4731b3fd67da6e11f4a8596fe813c8df93acf9ba 100644 (file)
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -33,13 +33,13 @@
           default: "https://github.com/ceph/ceph.git"
 
     builders:
-      # centos8 based jobs for octopus & pacific & master
+      # centos8 based jobs for octopus & pacific & quincy & master
       - conditional-step:
           condition-kind: shell
           condition-command: |
             #!/bin/bash
             set -x
-            if [[ ! "$CEPH_BRANCH" =~ master|octopus|pacific ]]; then
+            if [[ ! "$CEPH_BRANCH" =~ master|octopus|pacific|quincy ]]; then
               exit 1
             fi
           on-evaluation-failure: dont-run

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index c20b77c190a496d1efdba127ddc2979e14e4985b..8b9ee559a92ff64c89ca4f6515f29557a6dfcd1b 100644 (file)
--- a/scripts/sign-rpms
+++ b/scripts/sign-rpms
@@ -21,7 +21,7 @@ keyid=460F3994
 
 if [ $# -eq 0 ]; then
   # Default releases if no arguments passed
-  releases=( mimic nautilus octopus pacific )
+  releases=( mimic nautilus octopus pacific quincy )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index 1192ca5177d457f3a13d6c2ce4c54edfd5a3bd7c..7e68fb6bd7db325ee1425701f7a3aa623a72b1fc 100644 (file)
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -8,7 +8,7 @@
 # Since the binaries are created with a different repository layout, this
 # script maps directories like "centos/6" to "rpm-$release/el6"
 
-releases=${*:-"nautilus octopus pacific"}
+releases=${*:-"nautilus octopus pacific quincy"}
 
 ceph_sync() {
   release=$1