From 2ef8f8875620da52d34104e5214fdf718c22f1f7 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 10 Jan 2025 11:33:41 -0500 Subject: [PATCH 1/2] scripts: add tentacle Signed-off-by: Patrick Donnelly --- scripts/build_utils.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index f6c16be34..9fd255580 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -13,6 +13,9 @@ function create_venv_dir() { function release_from_version() { local ver=$1 case $ver in + 20.*) + rel="tentacle" + ;; 19.*) rel="squid" ;; @@ -1182,7 +1185,7 @@ start_tox() { # dev runs will need to be set to the release # that matches what the current ceph main # branch is at - local release="squid" + local release="tentacle" fi TOX_RUN_ENV=("timeout 3h") if [ -n "$ceph_docker_image_tag" ]; then From af8ebc2536e9e69fa79e8c95c30e710321330349 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 10 Jan 2025 11:50:37 -0500 Subject: [PATCH 2/2] *: update relevant scripts and triggers for tentacle Signed-off-by: Patrick Donnelly --- .../config/definitions/ceph-dev-trigger.yml | 26 +++++++++++++++++ .../config/definitions/ceph-api-nightly.yml | 1 + ceph-build/config/definitions/ceph-build.yml | 2 +- .../ceph-dashboard-cephadm-e2e-nightly.yml | 1 + ceph-dev-build/build/build_osc | 3 ++ ceph-dev-build/build/setup_osc | 4 +++ .../config/definitions/ceph-dev-cron.yml | 27 ++++++++++++++++++ .../definitions/ceph-dev-new-trigger.yml | 28 ++++++++++++++++++- .../config/definitions/ceph-pr-api.yml | 1 + .../definitions/ceph-volume-nightly.yml | 1 + .../ceph-windows-pull-requests.yml | 1 + scripts/sign-rpms | 2 +- scripts/sync-push | 2 +- 13 files changed, 95 insertions(+), 4 deletions(-) diff --git a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 2b6df8f8a..deeb4bbe6 100644 --- a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -29,6 +29,7 @@ - 'origin/quincy' - 'origin/reef' - 'origin/squid' + - 'origin/tentacle' skip-tag: true timeout: 20 wipe-workspace: true @@ -102,6 +103,31 @@ FORCE=True DISTROS=centos9 FLAVOR=crimson + # build tentacle on: + # default: jammy focal centos8 centos9 + # crimson: centos8 centos9 + - conditional-step: + condition-kind: regex-match + regex: .*tentacle.* + 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=jammy focal centos8 centos9 + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos9 + FLAVOR=crimson # build main on: # default: jammy focal centos8 centos9 # crimson: centos9 diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml index 36d097031..f01b85fce 100644 --- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml +++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml @@ -2,6 +2,7 @@ name: ceph-api-nightly ceph_branch: - main + - tentacle - squid - reef test_suite: diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index 005a010bd..00ee9f0ad 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: (reef|squid) + regex: (reef|squid|tentacle) label: '${BRANCH}' - condition-kind: regex-match regex: (focal|jammy|centos9|buster|bullseye|bookworm) 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 3f586ffd0..9bd989295 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 @@ -2,6 +2,7 @@ name: ceph-dashboard-cephadm-e2e-nightly ceph_branch: - main + - tentacle - squid - reef jobs: diff --git a/ceph-dev-build/build/build_osc b/ceph-dev-build/build/build_osc index 834f1f79a..5d1fc0ca4 100644 --- a/ceph-dev-build/build/build_osc +++ b/ceph-dev-build/build/build_osc @@ -2,6 +2,9 @@ set -ex case $RELEASE_BRANCH in +tentacle) + OBSREPO="openSUSE_Leap_15.3" + ;; squid) OBSREPO="openSUSE_Leap_15.3" ;; diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc index 19777f0bb..56aa2715a 100644 --- a/ceph-dev-build/build/setup_osc +++ b/ceph-dev-build/build/setup_osc @@ -38,6 +38,10 @@ raw_version=`echo $vers | cut -d '-' -f 1` RELEASE_BRANCH=$(release_from_version $raw_version) case $RELEASE_BRANCH in +tentacle) + DISTRO=opensuse + RELEASE="15.3" + ;; squid) DISTRO=opensuse RELEASE="15.3" diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index d3fd98c09..66871b6e8 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -30,6 +30,7 @@ browser: auto branches: - origin/main + - origin/tentacle - origin/squid - origin/reef skip-tag: true @@ -89,6 +90,32 @@ DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 + # build tentacle on: + # default: jammy centos9 windows + # crimson: centos9 + - conditional-step: + condition-kind: regex-match + regex: .*tentacle.* + 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=jammy centos9 windows + - project: 'ceph-dev' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos9 + FLAVOR=crimson + ARCHS=x86_64 # build main on: # default: jammy 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 3342f10e8..9952ae0da 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 @@ -79,12 +79,38 @@ DISTROS=centos9 FLAVOR=crimson ARCHS=x86_64 + # build tentacle on: + # default: jammy centos9 windows + # crimson: centos9 + - conditional-step: + condition-kind: regex-match + regex: .*tentacle.* + 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=jammy centos9 windows + - project: 'ceph-dev-new' + predefined-parameters: | + BRANCH=${GIT_BRANCH} + FORCE=True + DISTROS=centos9 + FLAVOR=crimson + ARCHS=x86_64 # If no release name is found in branch, build on all possible distro/flavor combos (except xenial, bionic, focal). # 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 '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)' + echo "${GIT_BRANCH}" | grep -v '\(reef\|squid\|tentacle\|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 c5dbfc06a..0737620f0 100644 --- a/ceph-pr-api/config/definitions/ceph-pr-api.yml +++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml @@ -36,6 +36,7 @@ - ceph white-list-target-branches: - main + - tentacle - squid - reef - "feature-.*" diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml index b092c48fe..556ab71bc 100644 --- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml +++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml @@ -12,6 +12,7 @@ - dmcrypt ceph_branch: - main + - tentacle - squid - reef 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 6dc6f0aa2..45c12a248 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 @@ -36,6 +36,7 @@ - ceph white-list-target-branches: - main + - tentacle - squid - reef trigger-phrase: 'jenkins test windows' diff --git a/scripts/sign-rpms b/scripts/sign-rpms index 39f0e091a..799672791 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=( reef squid ) + releases=( reef squid tentacle ) else releases=( "$@" ) fi diff --git a/scripts/sync-push b/scripts/sync-push index 1eacdb977..eb29cd90e 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=${*:-"reef squid"} + releases=${*:-"reef squid tentacle"} else releases=$* fi