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 73df1f5e11f50301c758477ecdce53be03754ce0..fff4a3b3f80aa11075ec3bcfb2a9513d49f2d105 100644 (file)
--- 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 a9686642e3f012decdee5f0fa4004dfa639ede04..aaab10fe841535b58e55be64d530394a78dae40a 100644 (file)
--- 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 b2f5298ef33a79b7e97376aaf6e2060180c179b9..e13af3fca7b3f43a0dba5db7a875560366165d11 100644 (file)
--- 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
+}