From f02edad9bae157a3b723b8a4e606419fbb0d8a47 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 25 Jun 2020 14:22:02 +0200 Subject: [PATCH] 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 --- ceph-dev-build/build/build_rpm | 3 +-- ceph-dev-new-build/build/build_rpm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 8982acbce..73df1f5e1 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 6f5a240e9..a9686642e 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 -- 2.47.3