]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rados/test_envlibrados_rocksdb: Build correct rocksdb 35387/head
authorBrad Hubbard <bhubbard@redhat.com>
Thu, 9 Apr 2020 04:33:51 +0000 (14:33 +1000)
committerNathan Cutler <ncutler@suse.com>
Thu, 4 Jun 2020 12:43:54 +0000 (14:43 +0200)
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 <bhubbard@redhat.com>
(cherry picked from commit 1361913f5995f8a4c8e1b0f5c661ad09e66fe9aa)

qa/workunits/rados/test_envlibrados_for_rocksdb.sh

index 1360f6dfe5b4832f09742b4026789958a4403807..f342dd1865ed4eb8d6f6a7bc94cb1a641830d5a3 100755 (executable)
@@ -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