From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 Jul 2020 13:29:15 +0000 (+0800)
Subject: ceph-dev-*-build: reset CI_CONTAINER when building nautilus
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d86ed63576a7dcc213c211b7678da2af6b6de108;p=ceph-build.git

ceph-dev-*-build: reset CI_CONTAINER when building nautilus

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

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 73df1f5e..fff4a3b3 100644
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -6,6 +6,8 @@ set -ex
 # set of shell scripts and repos involved.
 CI_CONTAINER=${CI_CONTAINER:-false}
 
+maybe_reset_ci_container
+
 # create a release directory for ceph-build tools
 mkdir -p release
 cp -a dist release/${vers}
diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index a9686642..aaab10fe 100644
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -7,6 +7,8 @@ set -ex
 # set of shell scripts and repos involved.
 CI_CONTAINER=${CI_CONTAINER:-false}
 
+maybe_reset_ci_container
+
 # create a release directory for ceph-build tools
 mkdir -p release
 cp -a dist release/${vers}
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index b2f5298e..e13af3fc 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1072,3 +1072,12 @@ get_nr_build_jobs() {
     fi
     echo $n_build_jobs
 }
+
+maybe_reset_ci_container() {
+    # ceph-container includes ceph-mgr-cephadm by default, but nautilus does
+    # not ship this package
+    if [[ "$CI_CONTAINER" && "$BRANCH" =~ nautilus ]]; then
+        echo "disabling CI container build for $BRANCH"
+        CI_CONTAINER=false
+    fi
+}