From: Vikhyat Umrao <vikhyat@redhat.com>
Date: Thu, 3 Feb 2022 23:43:23 +0000 (-0800)
Subject: add quincy targets
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b11d5b8d0ec2bfc1f8ded91a4055acc6d29a72c9;p=ceph-build.git

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 fa7f4071..e6548c38 100644
--- 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 061cd446..40528314 100644
--- 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 04d27461..2405e3a2 100644
--- 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 731a19a0..4731b3fd 100644
--- 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 c20b77c1..8b9ee559 100644
--- 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 1192ca51..7e68fb6b 100644
--- 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