From 710fbac7b34c54f4dba6a6e96a813ff203181ab4 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 23 Jul 2025 14:59:41 -0400 Subject: [PATCH] install-deps: Add Rocky 9, combine if statements Signed-off-by: David Galloway (cherry picked from commit add0dc2c96038128c27031f708008ccc625859e9) --- install-deps.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 32c4f34b514..cc7e15a6250 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -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" -- 2.39.5