From dc30261816c548f84babf9c14429a510d27589bb Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Wed, 29 Apr 2020 16:09:52 +0530 Subject: [PATCH] add crimson flavor build for centos8 Signed-off-by: Deepika Upadhyay --- ceph-dev-new-build/build/build_rpm | 3 ++- ceph-dev-new-setup/build/build | 1 + .../config/definitions/ceph-dev-new-trigger.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm index a2e1e7ef9..6f5a240e9 100644 --- a/ceph-dev-new-build/build/build_rpm +++ b/ceph-dev-new-build/build/build_rpm @@ -187,7 +187,8 @@ 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 +# build container image that supports building crimson-osd +if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $FLAVOR != "notcmalloc" ]] ; then loop=0 ready=false while ((loop < 15)); do diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build index 30de0dcc3..e0066cdb4 100644 --- a/ceph-dev-new-setup/build/build +++ b/ceph-dev-new-setup/build/build @@ -77,6 +77,7 @@ case "${FLAVOR}" in 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" ;; diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml index 7cc698d80..499f4065f 100644 --- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml +++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml @@ -158,7 +158,7 @@ predefined-parameters: | BRANCH=${GIT_BRANCH} FORCE=True - DISTROS=focal + DISTROS=focal centos8 FLAVOR=crimson wrappers: -- 2.47.3