Remove quincy builds/mentions from most builds/build configs.

Intentionally leaving the map from number to name in build_utils.sh for
historical purposes.

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index c51321c400cff54c3390df0e0d21bc4e95b427b2..36d0970317e5644ca342aaa9bb12a5970d0ac470 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -4,7 +4,6 @@
       - main
       - squid
       - reef
-      - quincy
     test_suite:
       - backend:
           test_suite_script: run-backend-api-tests.sh

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index a101450eeac6f968236ad8934c9c2e2f252c68f7..397655f5520f44001038085e454b57d35b718716 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -59,16 +59,13 @@
       - conditional-step:
           condition-kind: or
           condition-operands:
-            - condition-kind: regex-match
-              regex: (jewel|kraken|luminous)
-              label: '${BRANCH}'
             - condition-kind: and
               condition-operands:
                 - condition-kind: regex-match
-                  regex: (mimic|nautilus|octopus|pacific|quincy|reef|squid)
+                  regex: (reef|squid)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
-                  regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye|bookworm)
+                  regex: (focal|jammy|centos9|buster|bullseye|bookworm)
                   label: '${DIST}'
           on-evaluation-failure: dont-run
           steps:

diff --git a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
index ed8d7349d380dfbf8db017b24d8222232ebd0fdf..3f586ffd0cad082f99acadeb399950043f426ba0 100644 (file)
--- a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
+++ b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
@@ -4,7 +4,6 @@
       - main
       - squid
       - reef
-      - quincy
     jobs:
       - '{name}-{ceph_branch}'
 

diff --git a/ceph-dev-build/build/build_osc b/ceph-dev-build/build/build_osc
index e80c3226718ee6dfcc36d7294a6de1ae72215adb..834f1f79aa8c1ae0c9796925313284de204ecf10 100644 (file)
--- a/ceph-dev-build/build/build_osc
+++ b/ceph-dev-build/build/build_osc
@@ -8,24 +8,6 @@ squid)
 reef)
     OBSREPO="openSUSE_Leap_15.3"
     ;;
-quincy)
-    OBSREPO="openSUSE_Leap_15.3"
-    ;;
-pacific)
-    OBSREPO="openSUSE_Leap_15.3"
-    ;;
-octopus)
-    OBSREPO="openSUSE_Leap_15.2"
-    ;;
-nautilus)
-    OBSREPO="openSUSE_Leap_15.1"
-    ;;
-mimic)
-    OBSREPO="openSUSE_Leap_15.0"
-    ;;
-luminous)
-    OBSREPO="openSUSE_Leap_42.3"
-    ;;
 *)
     echo Not supported release '$RELEASE_BRANCH' by openSUSE
     exit 1

diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc
index f697ae33bf83d1563321d06a21625db34a84e5fd..19777f0bbdab9f2a0ee1e5490379a3336162e89a 100644 (file)
--- a/ceph-dev-build/build/setup_osc
+++ b/ceph-dev-build/build/setup_osc
@@ -46,30 +46,6 @@ reef)
     DISTRO=opensuse
     RELEASE="15.3"
     ;;
-quincy)
-    DISTRO=opensuse
-    RELEASE="15.3"
-    ;;
-pacific)
-    DISTRO=opensuse
-    RELEASE="15.3"
-    ;;
-octopus)
-    DISTRO=opensuse
-    RELEASE="15.2"
-    ;;
-nautilus)
-    DISTRO=opensuse
-    RELEASE="15.1"
-    ;;
-mimic)
-    DISTRO=opensuse
-    RELEASE="15.0"
-    ;;
-luminous)
-    DISTRO=opensuse
-    RELEASE="42.3"
-    ;;
 *)
     echo Not supported release '$RELEASE_BRANCH' by openSUSE
     exit 1

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index cc0b3d36e4dce932236880e2828d4933515b2818..d3fd98c09cb21deece28a525cc4945883fe92592 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -32,30 +32,11 @@
             - origin/main
             - origin/squid
             - origin/reef
-            - origin/quincy
           skip-tag: true
           timeout: 20
           wipe-workspace: true
 
     builders:
-      # build quincy on:
-      # default: focal centos9 leap15
-      - 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 centos9 leap15
       # build reef on:
       # default: jammy focal centos9 windows
       # crimson: centos9

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 d57efc74ef0392666fb7d9c282b82ee75e53a285..3342f10e8262bbb1ccb86653ad2c57b9579b0ac8 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
@@ -27,114 +27,6 @@
           wipe-workspace: true
 
     builders:
-      # Build luminous on:
-      # default: centos7 bionic xenial trusty
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*luminous.*
-          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=centos7 bionic xenial trusty
-      # build mimic on:
-      # default: bionic xenial centos7
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*mimic.*
-          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=bionic xenial centos7
-      # build nautilus on:
-      # default: bionic xenial centos7 centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*nautilus.*
-          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=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:
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=focal bionic centos7 centos8 leap15
-      # build pacific on:
-      # default: focal bionic centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*pacific.*
-          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 bionic centos8 windows
-      # build quincy on:
-      # default: focal jammy centos9 leap15
-      - 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 jammy centos9 leap15
       # build reef on:
       # default: jammy focal centos9 windows
       # crimson: centos9
@@ -192,7 +84,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
+            echo "${GIT_BRANCH}" | grep -v '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:

diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index eebd1affff587dda83fc774707ccd5c81d01f249..0a1af251df609458e716c3014f14a11e2a635aa9 100644 (file)
--- a/ceph-pr-api/config/definitions/ceph-pr-api.yml
+++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml
@@ -38,10 +38,6 @@
             - main
             - squid
             - reef
-            - quincy
-            - pacific
-            - octopus
-            - nautilus
             - "feature-.*"
           trigger-phrase: 'jenkins test api'
           skip-build-phrase: '^jenkins do not test.*'

diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index cebefbfbbd2ce5b3ed1b5894db59281fc10621c1..d76ea949a50a5fe0f87caaeff2de90da50a5172f 100644 (file)
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -16,11 +16,7 @@ update_vagrant_boxes
 
 cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND
 
-if [[ "$CEPH_BRANCH" == "pacific" ]]; then
-    CEPH_ANSIBLE_BRANCH="stable-6.0"
-elif [[ "$CEPH_BRANCH" == "quincy" ]]; then
-    CEPH_ANSIBLE_BRANCH="stable-7.0"
-elif [[ "$CEPH_BRANCH" == "reef" ]]; then
+if [[ "$CEPH_BRANCH" == "reef" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-8.0"
 else
     CEPH_ANSIBLE_BRANCH="main"

diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
index c10bab191370fe7ae0a92ca8e5dadd7b2c0cf247..6dc6f0aa234d52d5b897f7a0382cbb7b25294b9d 100644 (file)
--- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
+++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
@@ -38,7 +38,6 @@
             - main
             - squid
             - reef
-            - quincy
           trigger-phrase: 'jenkins test windows'
           skip-build-phrase: '^jenkins do not test.*'
           only-trigger-phrase: false

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index 7f80636d3f6f3b48116103f48429648ed303f951..39f0e091ac2f802ca21dbbf5f06e260e8adc37b9 100755 (executable)
--- a/scripts/sign-rpms
+++ b/scripts/sign-rpms
@@ -30,7 +30,7 @@ project=$1; shift
 
 if [ $# -eq 0 ]; then
   # Default releases if no arguments passed
-  releases=( quincy reef squid )
+  releases=( reef squid )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index 9d2ac82b58a5c3b51201ababb4b32dfa9093f4b8..1eacdb977b8f4b4f5c04dba0f2de83dbf669b38b 100755 (executable)
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -22,7 +22,7 @@ project=$1; shift
 prerelease_dir=/data/download.ceph.com/www/prerelease/${project}
 
 if [[ "$project" == "ceph" ]] ; then
-  releases=${*:-"quincy reef squid"}
+  releases=${*:-"reef squid"}
 else
   releases=$*
 fi