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

This reverts commit d86ed63576a7dcc213c211b7678da2af6b6de108.

if we are able to build container images for nautilus on centos7 and
centos8, there is no need to skip this step.

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 f4d12b72676a3a3f2f34266824128d38f1a3dcc7..c36d33ec526ecf26ace0b1a39a850e8b3f8726f0 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -6,8 +6,6 @@ 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 e09408c136839a2118978a7bf27c86e681c3a109..9c094b095a3a9f21d7ccf3902b7adff57d866f0e 100644 (file)
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -7,8 +7,6 @@ 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 463ce76954240d4a1693a640ad6b69e2ec3dd5cd..9eb683ca12e2c7ac5ba2abb7d97f10f14ffff010 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1084,15 +1084,6 @@ get_nr_build_jobs() {
     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
-}
-
 setup_rpm_build_deps() {
     $SUDO yum install -y yum-utils
     if [ "$RELEASE" = 7 ]; then