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 <sage@redhat.com>

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 3f443b95b8e2824cd98be68043aa4d4f1bb7273b..8ee38dc937e595762e0d66ef0a8b2136d279d203 100644 (file)
--- 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 cee88cc01495996b68bf4c71ed03246afd412f18..01c5d5cc0f12fa47a0617a2a490c088ec44672bc 100644 (file)
--- 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