]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
build_utils: check if PROFILE for pbuilder exists 1862/head
authorDeepika Upadhyay <dupadhya@redhat.com>
Fri, 9 Jul 2021 20:20:01 +0000 (01:50 +0530)
committerDeepika Upadhyay <dupadhya@redhat.com>
Sat, 10 Jul 2021 11:28:24 +0000 (16:58 +0530)
since not sure if --profile accepts comma or not, added this check

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
scripts/build_utils.sh

index 173bd9bfee8e706bfa81961c38f1a02c9ef6f074..4c0e1a42b40ca03c358c292c1b828a0026f5180d 100644 (file)
@@ -840,7 +840,7 @@ gen_debian_version() {
 # Flavor Builds support
 # - CEPH_EXTRA_RPMBUILD_ARGS is consumed by build_rpms()
 # - CEPH_EXTRA_CMAKE_ARGS is consumed by debian/rules and ceph.spec directly
-# - PROFILES is consumed by pbuilder
+# - PROFILES is consumed by build_debs()
 ceph_build_args_from_flavor() {
     local flavor=$1
     shift
@@ -914,7 +914,12 @@ 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 \