From: Casey Bodley Date: Wed, 4 Jun 2025 20:57:37 +0000 (-0400) Subject: remove 'jaeger' flavor now that it's on by default X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a22f7c6e53ca3401e2e9ecab96e764c6b7596a75;p=ceph-build.git remove 'jaeger' flavor now that it's on by default jaeger was enabled by default in all ceph builds in https://github.com/ceph/ceph/pull/44684 which was present in reef and later releases. so no supported releases need a flavor to turn it on ceph-dev-new-trigger hadn't been updated from 'DISTROS=centos8 focal' so is probably not being used Signed-off-by: Casey Bodley --- 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 a96ea195..0a168b2a 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 @@ -98,7 +98,7 @@ - conditional-step: condition-kind: shell condition-command: | - echo "${{GIT_BRANCH}}" | grep -v '\(reef\|squid\|tentacle\|centos9-only\|crimson-only\|jaeger\)' + echo "${{GIT_BRANCH}}" | grep -v '\(reef\|squid\|tentacle\|centos9-only\|crimson-only\)' on-evaluation-failure: dont-run steps: - shell: @@ -119,7 +119,7 @@ DISTROS=centos9 FLAVOR=crimson-debug ARCHS=x86_64 - # build only centos9, no crimson, no jaeger + # build only centos9, no crimson - conditional-step: condition-kind: regex-match regex: .*centos9-only.* @@ -167,27 +167,6 @@ DISTROS=centos9 FLAVOR=crimson-release ARCHS=x86_64 - # Build jaegertracing branch on needed env, don't waste resources on the default one. - # Useful for testing specific builds failure - # default: focal, centos8 - - conditional-step: - condition-kind: regex-match - regex: .*jaeger.* - label: '${{GIT_BRANCH}}' - on-evaluation-failure: dont-run - steps: - - shell: - !include-raw-verbatim: - - ../../../scripts/build_utils.sh - - ../../build/notify - - trigger-builds: - - project: 'ceph-dev-new' - predefined-parameters: | - BRANCH=${{GIT_BRANCH}} - FORCE=True - DISTROS=centos8 focal - FLAVOR=jaeger - ARCHS=x86_64 # sccache - conditional-step: condition-kind: regex-match diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index f90589c3..8b1ed0db 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -53,9 +53,8 @@ - default - crimson-debug - crimson-release - - jaeger default: "default" - description: "Type of Ceph build, choices are: crimson-debug, crimson-release, jaeger, default. Defaults to: 'default'" + description: "Type of Ceph build, choices are: crimson-debug, crimson-release, default. Defaults to: 'default'" - string: name: CI_CONTAINER diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml index bb5e93d1..71f1b2e9 100644 --- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml +++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml @@ -61,9 +61,8 @@ - default - crimson-debug - crimson-release - - jaeger default: "default" - description: "Type of Ceph build, choices are: crimson-debug, crimson-release, jaeger, default. Defaults to: 'default'" + description: "Type of Ceph build, choices are: crimson-debug, crimson-release, default. Defaults to: 'default'" - bool: name: CI_CONTAINER diff --git a/ceph-source-dist/build/Jenkinsfile b/ceph-source-dist/build/Jenkinsfile index 95fc5fd0..1d29707f 100644 --- a/ceph-source-dist/build/Jenkinsfile +++ b/ceph-source-dist/build/Jenkinsfile @@ -22,10 +22,6 @@ pipeline { env.CEPH_EXTRA_RPMBUILD_ARGS="--with crimson" env.DEB_BUILD_PROFILES="pkg.ceph.crimson" break - case "jaeger": - env.CEPH_EXTRA_RPMBUILD_ARGS="--with jaeger" - env.DEB_BUILD_PROFILES="pkg.ceph.jaeger" - break default: println "FLAVOR={env.FLAVOR} is invalid" assert false diff --git a/ceph-source-dist/config/definitions/ceph-source-dist.yml b/ceph-source-dist/config/definitions/ceph-source-dist.yml index 54a255cc..01aaaa45 100644 --- a/ceph-source-dist/config/definitions/ceph-source-dist.yml +++ b/ceph-source-dist/config/definitions/ceph-source-dist.yml @@ -43,7 +43,6 @@ - default - crimson-debug - crimson-release - - jaeger - string: name: CEPH_BUILD_BRANCH diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index ec6c69ff..d753ba9a 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -876,10 +876,6 @@ ceph_build_args_from_flavor() { CEPH_EXTRA_RPMBUILD_ARGS="--with crimson" DEB_BUILD_PROFILES="pkg.ceph.crimson" ;; - jaeger) - CEPH_EXTRA_RPMBUILD_ARGS="--with jaeger" - DEB_BUILD_PROFILES="pkg.ceph.jaeger" - ;; *) echo "unknown FLAVOR: ${FLAVOR}" >&2 exit 1 @@ -1485,7 +1481,7 @@ setup_rpm_build_deps() { sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec - # enable more build depends required by build flavor(jaeger, crimson) + # enable more build depends required by build flavor(crimson) case "${FLAVOR}" in crimson-debug) sed -i -e 's/%bcond_with crimson/%bcond_without crimson/g' $DIR/ceph.spec @@ -1493,9 +1489,6 @@ setup_rpm_build_deps() { crimson-release) sed -i -e 's/%bcond_with crimson/%bcond_without crimson/g' $DIR/ceph.spec ;; - jaeger) - sed -i -e 's/%bcond_with jaeger/%bcond_without jaeger/g' $DIR/ceph.spec - ;; esac # Make sure we have all the rpm macros installed and at the latest version