qa: enable CRB repo for RHEL8

instead of enabling PowerTools repo, we need to enable CodeReady Builder
repo for RHEL8

also, since we are moving to RHEL8, there is no need to install cmake3
specifically for CentOS. CentOS 8 comes with cmake3.

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

diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
index 65c2fc3b9e7658f66a334c413308996e759da6e2..934380e5c47539567244ed6b69f29f7cacbd8300 100755 (executable)
--- a/qa/workunits/ceph-helpers-root.sh
+++ b/qa/workunits/ceph-helpers-root.sh
@@ -50,15 +50,6 @@ function install_one() {
     esac
 }
 
-function install_cmake3_on_centos7 {
-    source /etc/os-release
-    local MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"
-    sudo yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/x86_64/
-    sudo yum install --nogpgcheck -y epel-release
-    sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
-    sudo yum install -y cmake3
-}
-
 function install_cmake3_on_xenial {
     install_pkg_on_ubuntu \
        ceph-cmake \

diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
index 56aa5da0f545b1eb8ff53645c322840cc6a1c2aa..762a44f189d8e2ca709a8ab568452a46c607ef75 100755 (executable)
--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
@@ -31,15 +31,18 @@ case $(distro_id) in
         esac
                ;;
        centos|fedora|rhel)
-               # el8 needs PowerTools for snappy-devel
-               test -x /usr/bin/dnf && sudo dnf config-manager --set-enabled PowerTools || true
-               install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64
-        if [ $(distro_id) = "fedora" ]; then
-            install cmake
-        else
-            install_cmake3_on_centos7
-        fi
-               ;;
+        case $(distro_id) in
+            centos)
+                # centos needs PowerTools repo for snappy-devel
+                test -x /usr/bin/dnf && sudo dnf config-manager --set-enabled PowerTools || true
+                ;;
+            rhel)
+                # RHEL needs CRB repo for snappy-devel
+                sudo subscription-manager repos --enable "codeready-builder-for-rhel-8-x86_64-rpms"
+                ;;
+        esac
+        install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64 cmake
+        ;;
        opensuse*|suse|sles)
                install git gcc-c++ snappy-devel zlib-devel libbz2-devel libradospp-devel
                ;;