From: Kefu Chai <kchai@redhat.com>
Date: Sat, 10 Jul 2021 12:20:44 +0000 (+0800)
Subject: Merge pull request #1870 from ideepika/crimson-pkg-build
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=73c82afb065f503835dc3dfa1513349576695c6b;p=ceph-build.git

Merge pull request #1870 from ideepika/crimson-pkg-build

build_utils: specify buildprofiles for crimson build

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

73c82afb065f503835dc3dfa1513349576695c6b
diff --cc scripts/build_utils.sh
index a3ac1098,a7445d79..23634cd5
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@@ -855,11 -851,8 +852,12 @@@ ceph_build_args_from_flavor() 
          CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
          CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug"
          CEPH_EXTRA_CMAKE_ARGS+=" -DWITH_SEASTAR=ON"
+         PROFILES="pkg.ceph.crimson"
          ;;
 +    jaeger)
 +        CEPH_EXTRA_RPMBUILD_ARGS="--with jaeger"
 +        PROFILES="pkg.ceph.jaeger"
 +        ;;
      *)
          echo "unknown FLAVOR: ${FLAVOR}" >&2
          exit 1
@@@ -914,13 -907,8 +912,14 @@@ build_debs() 
  
      CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
      DEB_BUILD_OPTIONS="parallel=$(get_nr_build_jobs)"
+     PROFILES="nocheck,$PROFILES"
  
 +    if [ -z "$PROFILES" ]; then
 +      PROFILES="nocheck,$PROFILES"
 +    else
 +      PROFILES="nocheck"
 +    fi
 +
      # pass only those env vars specifically noted
      sudo \
          CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS" \