From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Dec 2019 22:00:36 +0000 (-0600)
Subject: qa/standalone/test_ceph_daemon.sh: clone corpus explicitly
X-Git-Tag: v15.1.0~564^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d3a035b26d59d2802e6914f477c223b88f22fc9;p=ceph.git

qa/standalone/test_ceph_daemon.sh: clone corpus explicitly

When this is run by teuthology we don't have a full ceph source tree
checkout with submodules.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 036727923dee..9714806e5155 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -12,7 +12,10 @@ IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'ceph/daemon-base:latest-nautilus'}
 IMAGE_MIMIC=${IMAGE_MIMIC:-'ceph/daemon-base:latest-mimic'}
 
 CORPUS_GIT_SUBMOD="ceph-daemon-adoption-corpus"
-CORPUS_DIR=${SCRIPT_DIR}/../../${CORPUS_GIT_SUBMOD}/archive
+TMPDIR=$(mktemp -d)
+trap "rm -rf $TMPDIR" EXIT
+git clone https://github.com/ceph/$CORPUS_GIT_SUBMOD $TMPDIR
+CORPUS_DIR=${TMPDIR}/archive
 TEST_TARS=$(find ${CORPUS_DIR} -type f -iname *.tgz)
 
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
@@ -36,7 +39,7 @@ fi
 # respawn ourselves with a shebang
 PYTHONS="python3 python2"  # which pythons we test
 if [ -z "$PYTHON_KLUDGE" ]; then
-   TMPBINDIR=`mktemp -d $TMPDIR`
+   TMPBINDIR=$(mktemp -d)
    trap "rm -rf $TMPBINDIR" EXIT
    ORIG_CEPH_DAEMON="$CEPH_DAEMON"
    CEPH_DAEMON="$TMPBINDIR/ceph-daemon"