install-deps: Add Rocky 9, combine if statements

Signed-off-by: David Galloway <david.galloway@ibm.com>
(cherry picked from commit add0dc2c96038128c27031f708008ccc625859e9)
(cherry picked from commit 26f0cd35187959cb5b0765c027c3cfbc4dffd3bd)

diff --git a/install-deps.sh b/install-deps.sh
index 5ce5fe8084e4e872aaa62ee8179ffc70df9c4d76..555c3cf844917c93910b76d9b6a43713e25a5b72 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -497,14 +497,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"