From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 17 Apr 2020 17:19:30 +0000 (+0200)
Subject: qa/cephadm: make test_adoption checkout a specific commit
X-Git-Tag: v15.2.2~38^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4c00453a701463f4a7ae8efd717eb71648a41e51;p=ceph.git

qa/cephadm: make test_adoption checkout a specific commit

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)
---

diff --git a/qa/workunits/cephadm/test_adoption.sh b/qa/workunits/cephadm/test_adoption.sh
index 7960ede00054f..83e11a40ace64 100755
--- a/qa/workunits/cephadm/test_adoption.sh
+++ b/qa/workunits/cephadm/test_adoption.sh
@@ -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}