From 9367b1b600da84fa4ad5dc065f62b0c83996f024 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 9 Jun 2025 15:19:04 -0600 Subject: [PATCH] ceph-source-dist: drop flavor param Signed-off-by: Zack Cerza --- ceph-source-dist/build/Jenkinsfile | 26 ------------------- .../config/definitions/ceph-source-dist.yml | 7 ----- 2 files changed, 33 deletions(-) diff --git a/ceph-source-dist/build/Jenkinsfile b/ceph-source-dist/build/Jenkinsfile index 1d29707f..2a1b1c23 100644 --- a/ceph-source-dist/build/Jenkinsfile +++ b/ceph-source-dist/build/Jenkinsfile @@ -3,32 +3,6 @@ pipeline { label "gigantic" } stages { - stage("set environment variables") { - steps { - script { - switch (env.FLAVOR) { - case "default": - env.CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc" - env.CEPH_EXTRA_CMAKE_ARGS+=" -DALLOCATOR=tcmalloc" - env.CEPH_EXTRA_CMAKE_ARGS+=" -DWITH_SYSTEM_BOOST=OFF -DWITH_BOOST_VALGRIND=ON" - env.DEB_BUILD_PROFILES="" - break - case "crimson-debug": - env.CEPH_EXTRA_RPMBUILD_ARGS="--with crimson" - env.DEB_BUILD_PROFILES="pkg.ceph.crimson" - env.CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug" - break - case "crimson-release": - env.CEPH_EXTRA_RPMBUILD_ARGS="--with crimson" - env.DEB_BUILD_PROFILES="pkg.ceph.crimson" - break - default: - println "FLAVOR={env.FLAVOR} is invalid" - assert false - } - } - } - } stage("repository") { steps { dir("ceph") { diff --git a/ceph-source-dist/config/definitions/ceph-source-dist.yml b/ceph-source-dist/config/definitions/ceph-source-dist.yml index 01aaaa45..758122b3 100644 --- a/ceph-source-dist/config/definitions/ceph-source-dist.yml +++ b/ceph-source-dist/config/definitions/ceph-source-dist.yml @@ -37,13 +37,6 @@ name: BRANCH description: "The Ceph branch to build" - - choice: - name: FLAVOR - choices: - - default - - crimson-debug - - crimson-release - - string: name: CEPH_BUILD_BRANCH description: "Use the Jenkinsfile from this ceph-build branch" -- 2.39.5