From: Brad Hubbard <bhubbard@redhat.com>
Date: Fri, 15 May 2020 02:28:26 +0000 (+1000)
Subject: qa/workunits/rados/test_envlibrados_rocksdb: Remove Xenial cmake3 requirements
X-Git-Tag: v15.2.4~10^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee1747a7b4c859525a596fd373b554010a368a93;p=ceph.git

qa/workunits/rados/test_envlibrados_rocksdb: Remove Xenial cmake3 requirements

It's no longer necessary to handle Xenial as a special case.

Fixes: https://tracker.ceph.com/issues/45561

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 9d2632a9530b9d48b09937707d35bbe6e4735459)
---

diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
index 762a44f189d8..40c3f9f5fbe4 100755
--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
@@ -20,15 +20,7 @@ CURRENT_PATH=`pwd`
 # for rocksdb
 case $(distro_id) in
 	ubuntu|debian|devuan)
-		install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev
-        case $(distro_version) in
-            *Xenial*)
-                install_cmake3_on_xenial
-                ;;
-            *)
-                install cmake
-                ;;
-        esac
+		install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake
 		;;
 	centos|fedora|rhel)
         case $(distro_id) in