ceph-source-dist: drop flavor param

Signed-off-by: Zack Cerza <zack@cerza.org>

diff --git a/ceph-source-dist/build/Jenkinsfile b/ceph-source-dist/build/Jenkinsfile
index 1d29707f398a3a610a921019113ec644e4e48eb3..2a1b1c23950a330bc6c1f8ccaadf50ed9caa8396 100644 (file)
--- 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 01aaaa454cd0b3578e6c62d4d26d35d5b6830981..758122b34b702dca4e7f31460ba454304df9a91f 100644 (file)
--- 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"