From: Kefu Chai <kchai@redhat.com>
Date: Sat, 10 Jul 2021 12:25:39 +0000 (+0800)
Subject: scripts/build_utils: do not include nocheck in $PROFILES
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0cd216ecec1a5ae006904c7f875cf5bdf3d81f0;p=ceph-build.git

scripts/build_utils: do not include nocheck in $PROFILES

we don't use nocheck for disabling the "make check" dependencies,
instead, <pkg.ceph.check> is used to enable "make check" dependencies.
so they are not enabled by default.

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

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 23634cd5..4d6af252 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -847,6 +847,7 @@ ceph_build_args_from_flavor() {
     default)
         CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
         CEPH_EXTRA_CMAKE_ARGS+=" -DALLOCATOR=tcmalloc"
+        PROFILES=""
         ;;
     crimson)
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
@@ -912,13 +913,6 @@ 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 \