From: Kefu Chai Date: Wed, 19 Dec 2018 09:41:50 +0000 (+0800) Subject: ceph-*-build: skip unavailable repo when yum-builddep X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=806f274710ebddb92541d6a1f82746beff530323;p=ceph-build.git ceph-*-build: skip unavailable repo when yum-builddep as centos-sclo-rh-source leads us to 404 at this moment. and we are not using the source repo for building ceph. so we can just skip any unavailable repo. Fixes: http://tracker.ceph.com/issues/37707 Signed-off-by: Kefu Chai --- diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index d5e50fb6..6727401e 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 $DIR/ceph.spec +$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $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 ae0b5e30..1a4b49a7 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 $DIR/ceph.spec +$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $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 ae0b5e30..1a4b49a7 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 $DIR/ceph.spec +$SUDO yum-builddep -y --setopt=*.skip_if_unavailable=true $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH`