From 5e5eed38e6d4c8f48ff25ce0c01bd916d6039281 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 16 Jan 2019 12:00:28 -0700 Subject: [PATCH] Revert "ceph-*-build: skip unavailable repo when yum-builddep" The CentOS infra admins resolved the repository issue at https://bugs.centos.org/view.php?id=15606 . Generally speaking, we want Yum to bail out early if there is a Yum repo problem, rather than silently skipping over failures and possibly introducing side effects to our builds. This reverts commit 806f274710ebddb92541d6a1f82746beff530323. --- ceph-build/build/setup_rpm | 2 +- ceph-dev-build/build/setup_rpm | 2 +- ceph-dev-new-build/build/setup_rpm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 6727401e..d5e50fb6 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -38,7 +38,7 @@ elif [ "$ARCH" = arm64 ]; then $SUDO yum-config-manager --enable centos-sclo-rh-testing fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 1a4b49a7..ae0b5e30 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -38,7 +38,7 @@ elif [ "$ARCH" = arm64 ]; then $SUDO yum-config-manager --enable centos-sclo-rh-testing fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 1a4b49a7..ae0b5e30 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -38,7 +38,7 @@ elif [ "$ARCH" = arm64 ]; then $SUDO yum-config-manager --enable centos-sclo-rh-testing fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec -$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` -- 2.39.5