ceph-dev-*: add crimson flavor for master build

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

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 73df1f5e11f50301c758477ecdce53be03754ce0..b2be9596b2fa05f6c37abf6d5e949b91f4f54e2f 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -186,7 +186,7 @@ fi
 
 # XXX perhaps use job parameters instead of literals; then
 # later stages can also use them to compare etc.
-if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR == "default" ]] ; then
+if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR != "notcmalloc" ]] ; then
     loop=0
     ready=false
     while ((loop < 15)); do

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index b7a3b82b1329f6cdc6f9dbd4783d2cdf11a00a54..5c41d114cf9bf76666d30a0e8599ad16430b7dd3 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -38,15 +38,24 @@ git submodule update --init
 
 # Flavor Builds support
 
-if [ "${FLAVOR}" == "notcmalloc" ]
-then
-    echo "Detected notcmalloc flavor: will use flag: -DALLOCATOR=libc"
-    CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON"
-else
-    CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
-fi
+case "${FLAVOR}" in
+    notcmalloc)
+        echo "Detected notcmalloc flavor: will use flag: -DALLOCATOR=libc"
+        CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON"
+        ;;
+    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
 
 # 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/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 96cdf9003671245fba1149291bf1c2c19f19d0d0..72d980676ca818cac137fabedc268f1815c0ca7b 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -140,6 +140,7 @@
       # build master on:
       # default: focal bionic centos8 leap15
       # notcmalloc: centos8
+      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*master.*
@@ -162,6 +163,12 @@
                     FORCE=True
                     DISTROS=centos8
                     FLAVOR=notcmalloc
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
 
     wrappers:
       - inject-passwords:

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 6feae5a5bab4cd04ea36f6cb7d957cc06b2f05c5..79e19e32060430e63638a9000ff3042c6fa43421 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -56,8 +56,9 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           choices:
             - default
             - notcmalloc
+            - crimson
           default: "default"
-          description: "Type of Ceph build, choices are: notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
+          description: "Type of Ceph build, choices are: crimson, notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
 
       - bool:
           name: CI_CONTAINER