]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephadm: make test_adoption checkout a specific commit 34742/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 17 Apr 2020 17:19:30 +0000 (19:19 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 24 Apr 2020 16:13:37 +0000 (18:13 +0200)
Reason is, I want to have a test run of test_adoption, *before* master is affected.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6a7d0bd973c7f6c53eb2ea8adf914dbcb4ac6301)

qa/workunits/cephadm/test_adoption.sh

index 7960ede00054ff3934d699d5b14ebbc9db8dd926..83e11a40ace6409e683bd1bb8a97be8ba27438d3 100755 (executable)
@@ -3,6 +3,7 @@
 SCRIPT_NAME=$(basename ${BASH_SOURCE[0]})
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CEPHADM_SRC_DIR=${SCRIPT_DIR}/../../../src/cephadm
+CORPUS_COMMIT=50c5dd734638939facd1ed32295ce59c9a5986b4
 
 [ -z "$SUDO" ] && SUDO=sudo
 if [ -z "$CEPHADM" ]; then
@@ -54,9 +55,11 @@ CEPHADM="$SUDO $CEPHADM_BIN"
 CORPUS_GIT_SUBMOD="cephadm-adoption-corpus"
 TMPDIR=$(mktemp -d)
 git clone https://github.com/ceph/$CORPUS_GIT_SUBMOD $TMPDIR
-CORPUS_DIR=${TMPDIR}/archive
 trap "$SUDO rm -rf $TMPDIR" EXIT
 
+git -C $TMPDIR checkout $CORPUS_COMMIT
+CORPUS_DIR=${TMPDIR}/archive
+
 for subdir in `ls ${CORPUS_DIR}`; do
     for tarfile in `ls ${CORPUS_DIR}/${subdir} | grep .tgz`; do
        tarball=${CORPUS_DIR}/${subdir}/${tarfile}