diff --git a/ceph-dev-cron/build/notify b/ceph-dev-cron/build/notify index 27fa3cd8b..3e5df17d7 100644 --- a/ceph-dev-cron/build/notify +++ b/ceph-dev-cron/build/notify @@ -6,4 +6,10 @@ BRANCH=`branch_slash_filter ${GIT_BRANCH}` 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 51fd9df69..42dadffaf 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,14 +71,16 @@ - ../../../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 + # default: noble jammy rocky10 centos9 windows + # crimson: centos9 rocky10 - conditional-step: condition-kind: regex-match regex: .*tentacle.* @@ -88,22 +92,26 @@ - ../../../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' + 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: | - BRANCH=${{GIT_BRANCH}} FORCE=True - DISTROS=centos9 - FLAVOR=crimson-debug + 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.* @@ -115,25 +123,39 @@ - ../../../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' + 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: | - BRANCH=${{GIT_BRANCH}} FORCE=True - DISTROS=centos9 - FLAVOR=crimson-debug + DISTROS=centos9 rocky10 + 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 + DISTROS=centos9 rocky10 + FLAVORS=crimson-release 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: