From 5ab5e37b7c2e6d7c4b2d450a19e532f4c3e53632 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 21 Jul 2020 11:27:31 +0800 Subject: [PATCH] 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 --- ceph-dev-build/build/build_rpm | 2 -- ceph-dev-new-build/build/build_rpm | 2 -- scripts/build_utils.sh | 9 --------- 3 files changed, 13 deletions(-) diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index f4d12b72..c36d33ec 100644 --- 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 e09408c1..9c094b09 100644 --- 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 463ce769..9eb683ca 100644 --- 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 -- 2.39.5