From: Neha Ojha Date: Thu, 12 Nov 2020 20:46:43 +0000 (+0000) Subject: scripts/build_utils.sh: use correct DIST value for el7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1704%2Fhead;p=ceph-build.git scripts/build_utils.sh: use correct DIST value for el7 Fixes a3f26c8ab781a5ffe54aedf45be9e373bede4d6c, which ended up comparing [[ el7 == centos7 ]]. Follow-on fix for: https://tracker.ceph.com/issues/48162 Signed-off-by: Neha Ojha --- diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 5b19eadb4..42f8bf233 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -1292,7 +1292,7 @@ maybe_reset_ci_container() { if ! "$CI_CONTAINER"; then return fi - if [[ "$BRANCH" =~ octopus && "$DIST" == centos7 ]]; then + if [[ "$BRANCH" =~ octopus && "$DIST" == el7 ]]; then echo "disabling CI container build for $BRANCH" CI_CONTAINER=false fi