From f3033361aac091045e8dd8ba2d6d9d45ae92eaeb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Apr 2020 09:26:54 -0500 Subject: [PATCH] ceph-dev-*build: sudo -E for container build We need the environment, or else + sudo CI_CONTAINER=true SHA1=ca338cb74a4f503555323a668a2ba5b2e1845057 /bin/bash ./contrib/build-push-ceph-container-imgs.sh + CI_CONTAINER=true + true + CEPH_BRANCH= + for v in BRANCH SHA1 CONTAINER_REPO_HOSTNAME CONTAINER_REPO_ORGANIZATION CONTAINER_REPO_USERNAME CONTAINER_REPO_PASSWORD + require BRANCH + [[ -z '' ]] + echo 'Required variable BRANCH not set, exiting' Required variable BRANCH not set, exiting Signed-off-by: Sage Weil --- ceph-dev-build/build/build_rpm | 2 +- ceph-dev-new-build/build/build_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 3f443b95..8ee38dc9 100644 --- a/ceph-dev-build/build/build_rpm +++ b/ceph-dev-build/build/build_rpm @@ -204,7 +204,7 @@ if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR == "default" ]] cd $WORKSPACE/ceph-container # avoid failing the build if build-push fails - sudo CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh || /bin/true + sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh || /bin/true cd $WORKSPACE fi diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm index cee88cc0..01c5d5cc 100644 --- a/ceph-dev-new-build/build/build_rpm +++ b/ceph-dev-new-build/build/build_rpm @@ -205,7 +205,7 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $FLAVOR == "default" ]] cd $WORKSPACE/ceph-container # avoid failing the build if build-push fails - sudo CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh || /bin/true + sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} /bin/bash ./contrib/build-push-ceph-container-imgs.sh || /bin/true cd $WORKSPACE fi -- 2.39.5