From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 25 Jun 2020 12:22:02 +0000 (+0200)
Subject: ceph-dev-new-build: fail, if building containers fail
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f02edad9bae157a3b723b8a4e606419fbb0d8a47;p=ceph-build.git

ceph-dev-new-build: fail, if building containers fail

This avoids:

* unnecessary breakages in the master branch
* unnecessary pulpito runs due to failing containers

Let's fail early, instead of later in the pulpilto runs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 8982acbc..73df1f5e 100644
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -203,8 +203,7 @@ if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR == "default" ]]
     fi
 
     cd $WORKSPACE/ceph-container
-    # avoid failing the build if build-push fails
-    sudo -E 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
     cd $WORKSPACE
     sudo rm -rf ceph-container
 fi
diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index 6f5a240e..a9686642 100644
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -205,8 +205,7 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $FLAVOR != "notcmalloc"
     fi
 
     cd $WORKSPACE/ceph-container
-    # avoid failing the build if build-push fails
-    sudo -E 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
     cd $WORKSPACE
     sudo rm -rf ceph-container
 fi