]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps.sh: do not enable unavailable repos 35614/head
authorKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 08:00:23 +0000 (16:00 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 08:03:04 +0000 (16:03 +0800)
should be specific when enabling codeready-builder repos, there is
chance that some repos are just not available, while the required one
is. for instance, "codeready-builder-for-rhel-8-x86_64-eus-debug-rpms"
might not be available. and in that case, `install-deps.sh` just fails.

so in this change, only the required one is enabled. see also
https://fedoraproject.org/wiki/EPEL

Signed-off-by: Kefu Chai <kchai@redhat.com>
install-deps.sh

index e0b169c964015da8941ed184b724a560bed99af4..d12a8d38febd9e54c61d4fb70af6a080370590d8 100755 (executable)
@@ -370,7 +370,7 @@ else
                     $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
                     $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
                 elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then
-                    $SUDO subscription-manager repos --enable "codeready-builder-for-rhel-8-*-rpms"
+                    $SUDO subscription-manager repos --enable "codeready-builder-for-rhel-8-${ARCH}-rpms"
                    $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
                    $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
                 fi