]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rados/test_envlibrados_rocksdb: Remove Xenial cmake3 requirements
authorBrad Hubbard <bhubbard@redhat.com>
Fri, 15 May 2020 02:28:26 +0000 (12:28 +1000)
committerNathan Cutler <ncutler@suse.com>
Mon, 25 May 2020 16:58:30 +0000 (18:58 +0200)
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)

qa/workunits/rados/test_envlibrados_for_rocksdb.sh

index 1360f6dfe5b4832f09742b4026789958a4403807..fd4d960db978470c9e64b7c6bcaa22d3d3f1bfa5 100755 (executable)
@@ -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)
                install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64