]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
install-deps: Add Rocky 9, combine if statements
authorDavid Galloway <david.galloway@ibm.com>
Wed, 23 Jul 2025 18:59:41 +0000 (14:59 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Thu, 31 Jul 2025 21:53:28 +0000 (17:53 -0400)
Signed-off-by: David Galloway <david.galloway@ibm.com>
(cherry picked from commit add0dc2c96038128c27031f708008ccc625859e9)

install-deps.sh

index 32c4f34b514549597cc8f1fb2a176b2ff208a944..cc7e15a6250a4769fb6aff56bc34fa11c4c1a479 100755 (executable)
@@ -539,14 +539,11 @@ 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
                     $SUDO dnf -y module enable javapackages-tools
-                elif test $ID = centos -a $MAJOR_VERSION = 9 ; then
+                elif { [ "$ID" = centos ] || [ "$ID" = rocky ]; } && [ "$MAJOR_VERSION" -ge 9 ]; then
                     $SUDO dnf config-manager --set-enabled crb
-                elif test $ID = centos -a $MAJOR_VERSION = 10 ; then
-                    $SUDO dnf config-manager --set-enabled crb
-                    setup_lab_extras_repo
-                elif test $ID = rocky -a $MAJOR_VERSION = 10 ; then
-                    $SUDO dnf config-manager --set-enabled crb
-                    setup_lab_extras_repo
+                    if [ "$MAJOR_VERSION" -eq 10 ]; then
+                        setup_lab_extras_repo
+                    fi
                 elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then
                     dts_ver=11
                     $SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms"