From: Brad Hubbard Date: Thu, 9 Apr 2020 04:33:51 +0000 (+1000) Subject: qa/workunits/rados/test_envlibrados_rocksdb: Build correct rocksdb X-Git-Tag: v14.2.10~12^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35387%2Fhead;p=ceph.git qa/workunits/rados/test_envlibrados_rocksdb: Build correct rocksdb We should be building the version of rocksdb the release is pinned to, not master. Let's just update the rocksdb submodule and clone that. Fixes: https://tracker.ceph.com/issues/44981 Signed-off-by: Brad Hubbard (cherry picked from commit 1361913f5995f8a4c8e1b0f5c661ad09e66fe9aa) --- diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh index 1360f6dfe5b4..f342dd1865ed 100755 --- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh @@ -63,7 +63,11 @@ echo "Compile rocksdb" if [ -e rocksdb ]; then rm -fr rocksdb fi -git clone https://github.com/facebook/rocksdb.git --depth 1 + +pushd $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../ +git submodule update --init src/rocksdb +popd +git clone $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../src/rocksdb rocksdb # compile code cd rocksdb