ceph-dev-pipeline, build_utils: cleanup case switch

The only two flavors are default and debug. The debug case should
apply additional flags on top of the defualt ones. There's no need
for case switch.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Author: Matan-B

ceph-dev-pipeline/build/Jenkinsfile

@@ -440,20 +440,17 @@ pipeline {
                 }
                 def ceph_extra_cmake_args = "";
                 def deb_build_profiles = "";
-                switch (env.FLAVOR) {
-                  case "default":
-                    ceph_extra_cmake_args += " -DALLOCATOR=tcmalloc"
-                    ceph_extra_cmake_args += " -DWITH_SYSTEM_BOOST=OFF -DWITH_BOOST_VALGRIND=ON"
-                    if (os.version_name == "focal") {
-                      ceph_extra_cmake_args += " -DWITH_STATIC_LIBSTDCXX=ON"
-                    }
-                    break
-                  case "debug":
-                    ceph_extra_cmake_args += " -DCMAKE_BUILD_TYPE=Debug -DWITH_CEPH_DEBUG_MUTEX=ON"
-                    break
-                  default:
-                    println "FLAVOR=${env.FLAVOR} is invalid"
-                    assert false
+                ceph_extra_cmake_args += " -DALLOCATOR=tcmalloc"
+                ceph_extra_cmake_args += " -DWITH_SYSTEM_BOOST=OFF -DWITH_BOOST_VALGRIND=ON"
+                if (os.version_name == "focal") {
+                  ceph_extra_cmake_args += " -DWITH_STATIC_LIBSTDCXX=ON"
+                }
+                if (env.FLAVOR ==  "debug") {
+                  ceph_extra_cmake_args += " -DCMAKE_BUILD_TYPE=Debug -DWITH_CEPH_DEBUG_MUTEX=ON"
+                }
+                if (env.FLAVOR != "default" && env.FLAVOR != "debug") {
+                  println "FLAVOR=${env.FLAVOR} is invalid"
+                  assert false
                 }
                 bwc_command = "${bwc_command} ${bwc_cmd_sccache_flags}"
                 if ( os.pkg_type == "deb" ) {

scripts/build_utils.sh

@@ -876,21 +876,20 @@ ceph_build_args_from_flavor() {
     shift
 
     # shellcheck disable=SC2034
-    case "${flavor}" in
-    default)
-        CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-        CEPH_EXTRA_CMAKE_ARGS+=" -DALLOCATOR=tcmalloc"
-        # build boost with valgrind=on for https://tracker.ceph.com/issues/56500
-        CEPH_EXTRA_CMAKE_ARGS+=" -DWITH_SYSTEM_BOOST=OFF -DWITH_BOOST_VALGRIND=ON"
-        DEB_BUILD_PROFILES=""
-        ;;
-    debug)
+    CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
+    CEPH_EXTRA_CMAKE_ARGS+=" -DALLOCATOR=tcmalloc"
+    # build boost with valgrind=on for https://tracker.ceph.com/issues/56500
+    CEPH_EXTRA_CMAKE_ARGS+=" -DWITH_SYSTEM_BOOST=OFF -DWITH_BOOST_VALGRIND=ON"
+    DEB_BUILD_PROFILES=""
+
+    if [[ "$flavor" == "debug" ]]; then
         CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug -DWITH_CEPH_DEBUG_MUTEX=ON"
-        ;;
-    *)
-        echo "unknown FLAVOR: ${FLAVOR}" >&2
+    fi
+
+    if [[ "$flavor" != "default" && "$flavor" != "debug" ]]; then
+        echo "unknown FLAVOR: ${FLAVOR}" >&2"
         exit 1
-    esac
+    fi
 }
 
 write_dist_files()