From e1b5464daabf70b8d2b4e58632e090f7abb3ddf1 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 24 Sep 2025 13:54:24 -0400 Subject: [PATCH 1/3] ceph-dev-cron: Switch to ceph-dev-pipeline! Signed-off-by: David Galloway --- ceph-dev-cron/build/notify | 2 + .../config/definitions/ceph-dev-cron.yml | 48 ++++++++++++------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ceph-dev-cron/build/notify b/ceph-dev-cron/build/notify index 27fa3cd8b..409248dea 100644 --- a/ceph-dev-cron/build/notify +++ b/ceph-dev-cron/build/notify @@ -6,4 +6,6 @@ BRANCH=`branch_slash_filter ${GIT_BRANCH}` SHA1=${GIT_COMMIT} +echo "BRANCH=$BRANCH" > $WORKSPACE/branch.properties + update_build_status "queued" "ceph" diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 51fd9df69..63f019c9c 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -51,11 +51,13 @@ - ../../../scripts/build_utils.sh - ../../build/notify - trigger-builds: - - project: 'ceph-dev' + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=jammy focal centos9 windows + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist # build squid on: # default: noble jammy centos9 windows - conditional-step: @@ -69,11 +71,13 @@ - ../../../scripts/build_utils.sh - ../../build/notify - trigger-builds: - - project: 'ceph-dev' + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=noble jammy centos9 windows + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist # build tentacle on: # default: noble jammy centos9 windows # crimson: centos9 @@ -88,18 +92,22 @@ - ../../../scripts/build_utils.sh - ../../build/notify - trigger-builds: - - project: 'ceph-dev' + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=noble jammy centos9 windows - - project: 'ceph-dev' + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=centos9 - FLAVOR=crimson-debug + FLAVORS=crimson-debug ARCHS=x86_64 + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist # build main on: # default: noble jammy centos9 windows # crimson-debug: centos9 @@ -115,25 +123,31 @@ - ../../../scripts/build_utils.sh - ../../build/notify - trigger-builds: - - project: 'ceph-dev' + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=noble jammy centos9 windows - - project: 'ceph-dev' + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=centos9 - FLAVOR=crimson-debug + FLAVORS=crimson-debug ARCHS=x86_64 - - project: 'ceph-dev' + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist + - project: 'ceph-dev-pipeline' + property-file: branch.properties predefined-parameters: | - BRANCH=${{GIT_BRANCH}} FORCE=True DISTROS=centos9 - FLAVOR=crimson-release + FLAVORS=crimson-release ARCHS=x86_64 + CEPH_REPO=https://github.com/ceph/ceph + SETUP_JOB=ceph-source-dist wrappers: - inject-passwords: From 65b6f4bc1a97d47fa010b6f0d9fccf4b74d3e786 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 24 Sep 2025 15:34:11 -0400 Subject: [PATCH 2/3] ceph-dev-cron: Build main and tentacle for rocky10 Signed-off-by: David Galloway --- .../config/definitions/ceph-dev-cron.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 63f019c9c..7e9f7c69d 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -79,8 +79,8 @@ CEPH_REPO=https://github.com/ceph/ceph SETUP_JOB=ceph-source-dist # build tentacle on: - # default: noble jammy centos9 windows - # crimson: centos9 + # default: noble jammy rocky10 centos9 windows + # crimson: centos9 rocky10 - conditional-step: condition-kind: regex-match regex: .*tentacle.* @@ -96,22 +96,22 @@ property-file: branch.properties predefined-parameters: | FORCE=True - DISTROS=noble jammy centos9 windows + DISTROS=noble jammy rocky10 centos9 windows CEPH_REPO=https://github.com/ceph/ceph SETUP_JOB=ceph-source-dist - project: 'ceph-dev-pipeline' property-file: branch.properties predefined-parameters: | FORCE=True - DISTROS=centos9 + DISTROS=centos9 rocky10 FLAVORS=crimson-debug ARCHS=x86_64 CEPH_REPO=https://github.com/ceph/ceph SETUP_JOB=ceph-source-dist # build main on: - # default: noble jammy centos9 windows - # crimson-debug: centos9 - # crimson-release: centos9 + # default: noble jammy rocky10 centos9 windows + # crimson-debug: centos9 rocky10 + # crimson-release: centos9 rocky10 - conditional-step: condition-kind: regex-match regex: .*main.* @@ -127,14 +127,14 @@ property-file: branch.properties predefined-parameters: | FORCE=True - DISTROS=noble jammy centos9 windows + DISTROS=noble jammy rocky10 centos9 windows CEPH_REPO=https://github.com/ceph/ceph SETUP_JOB=ceph-source-dist - project: 'ceph-dev-pipeline' property-file: branch.properties predefined-parameters: | FORCE=True - DISTROS=centos9 + DISTROS=centos9 rocky10 FLAVORS=crimson-debug ARCHS=x86_64 CEPH_REPO=https://github.com/ceph/ceph @@ -143,7 +143,7 @@ property-file: branch.properties predefined-parameters: | FORCE=True - DISTROS=centos9 + DISTROS=centos9 rocky10 FLAVORS=crimson-release ARCHS=x86_64 CEPH_REPO=https://github.com/ceph/ceph From 06759489632ba651dd8c0e877cdc303c7e55f093 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 25 Sep 2025 16:07:56 -0400 Subject: [PATCH 3/3] ceph-dev-cron: Set build description Signed-off-by: David Galloway --- ceph-dev-cron/build/notify | 4 ++++ ceph-dev-cron/config/definitions/ceph-dev-cron.yml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/ceph-dev-cron/build/notify b/ceph-dev-cron/build/notify index 409248dea..3e5df17d7 100644 --- a/ceph-dev-cron/build/notify +++ b/ceph-dev-cron/build/notify @@ -8,4 +8,8 @@ SHA1=${GIT_COMMIT} echo "BRANCH=$BRANCH" > $WORKSPACE/branch.properties +# echo the branch and sha1 to set the ceph-dev-cron build description +# using the description-setter plugin (publishers section) +echo "BUILD_DESCRIPTION=BRANCH=$BRANCH SHA1=$SHA1" + update_build_status "queued" "ceph" diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 7e9f7c69d..42dadffaf 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -148,6 +148,14 @@ ARCHS=x86_64 CEPH_REPO=https://github.com/ceph/ceph SETUP_JOB=ceph-source-dist + # echo the branch and sha1 to set the ceph-dev-cron build description + # using the description-setter plugin (publishers section) +# - shell: 'echo "BUILD_DESCRIPTION=BRANCH=$BRANCH SHA1=$SHA1"' + + publishers: + - description-setter: + regexp: '^BUILD_DESCRIPTION=BRANCH=([^\s]+)\s+SHA1=([0-9A-Fa-f]{{7,40}})' + description: 'BRANCH: \1
SHA1: \2' wrappers: - inject-passwords: