From: Kefu Chai <kchai@redhat.com>
Date: Wed, 28 Apr 2021 06:12:14 +0000 (+0800)
Subject: ceph-dev-*setup: extract ceph_build_args_from_flavor() out
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc4a452490d94f40f63359c1ba0149fa81eb69e4;p=ceph-build.git

ceph-dev-*setup: extract ceph_build_args_from_flavor() out

so this helper can be shared by ceph-dev-new-setup and ceph-dev-setup
jobs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index a25f471c..344345c8 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -64,22 +64,7 @@ else
     echo "forcing."
 fi
 
-# Flavor Builds support
-
-case "${FLAVOR}" in
-    default)
-        CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
-        ;;
-    crimson)
-        echo "Detected crimson flavor: will use flag: -DWITH_SEASTAR=ON"
-        CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
-        ;;
-    *)
-        echo "unknown FLAVOR: ${FLAVOR}" >&2
-        exit 1
-esac
+ceph_build_args_from_flavor ${FLAVOR}
 
 mkdir -p release
 
diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 9b04314f..ed60f796 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -36,21 +36,7 @@ rm -rf release
 echo "Running submodule update ..."
 git submodule update --init
 
-# Flavor Builds support
-
-case "${FLAVOR}" in
-    default)
-        CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
-        ;;
-    crimson)
-        CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
-        ;;
-    *)
-        echo "unknown FLAVOR: ${FLAVOR}" >&2
-        exit 1
-esac
+ceph_build_args_from_flavor ${FLAVOR}
 
 # When using autotools/autoconf it is possible to see output from `git diff`
 # since some macros can be copied over to the ceph source, triggering this
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 8c9948ae..b0800844 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -818,6 +818,29 @@ gen_debian_version() {
     echo "${raw}${bptag}"
 }
 
+# Flavor Builds support
+# - CEPH_EXTRA_RPMBUILD_ARGS is consumed by build_rpms()
+# - CEPH_EXTRA_CMAKE_ARGS is consumed by debian/rules and ceph.spec directly
+ceph_build_args_from_flavor() {
+    local flavor=$1
+    shift
+
+    # shellcheck disable=SC2034
+    case "${flavor}" in
+    default)
+        CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
+        ;;
+    crimson)
+        CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
+        ;;
+    *)
+        echo "unknown FLAVOR: ${FLAVOR}" >&2
+        exit 1
+    esac
+}
+
 build_debs() {
     local vers=$1
     shift