]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
scripts/build_utils: do not include nocheck in $PROFILES 1873/head
authorKefu Chai <kchai@redhat.com>
Sat, 10 Jul 2021 12:25:39 +0000 (20:25 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 10 Jul 2021 12:31:26 +0000 (20:31 +0800)
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>
scripts/build_utils.sh

index 23634cd5256f6c95b16229ade8347ea4263d7f0e..4d6af2529ee2d0d4b54357cdca8e1a71e8b99e9c 100644 (file)
@@ -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 \