From: Brad Hubbard Date: Fri, 15 May 2020 02:28:26 +0000 (+1000) Subject: qa/workunits/rados/test_envlibrados_rocksdb: Remove Xenial cmake3 requirements X-Git-Tag: v14.2.11~36^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f46e619bb63e471d059d99d598990da53ecd2fd;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 (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 1360f6dfe5b..fd4d960db97 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) install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64