From 66c3c98dfa54db0c1a8fdae14f82efc41ced88f3 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 13 Jan 2025 17:17:23 -0800 Subject: [PATCH] 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 --- .../config/definitions/ceph-api-nightly.yml | 1 - ceph-build/config/definitions/ceph-build.yml | 7 +- .../ceph-dashboard-cephadm-e2e-nightly.yml | 1 - ceph-dev-build/build/build_osc | 18 --- ceph-dev-build/build/setup_osc | 24 ---- .../config/definitions/ceph-dev-cron.yml | 19 --- .../definitions/ceph-dev-new-trigger.yml | 110 +----------------- .../config/definitions/ceph-pr-api.yml | 4 - ceph-volume-nightly/build/build | 6 +- .../ceph-windows-pull-requests.yml | 1 - scripts/sign-rpms | 2 +- scripts/sync-push | 2 +- 12 files changed, 6 insertions(+), 189 deletions(-) diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml index c51321c4..36d09703 100644 --- 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 a101450e..397655f5 100644 --- 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 ed8d7349..3f586ffd 100644 --- 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 e80c3226..834f1f79 100644 --- 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 f697ae33..19777f0b 100644 --- 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 cc0b3d36..d3fd98c0 100644 --- 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 d57efc74..3342f10e 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 @@ -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 eebd1aff..0a1af251 100644 --- 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 cebefbfb..d76ea949 100644 --- 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 c10bab19..6dc6f0aa 100644 --- 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 7f80636d..39f0e091 100755 --- 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 9d2ac82b..1eacdb97 100755 --- 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 -- 2.47.3