]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/test_ceph_daemon.sh: clone corpus explicitly 31772/head
authorSage Weil <sage@redhat.com>
Fri, 6 Dec 2019 22:00:36 +0000 (16:00 -0600)
committerMichael Fritch <mfritch@suse.com>
Tue, 10 Dec 2019 18:34:42 +0000 (11:34 -0700)
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>
qa/standalone/test_ceph_daemon.sh

index 036727923deefdff6c5569134bd492db55a34597..9714806e5155519c1bde4a439fe7098b05dfa59f 100755 (executable)
@@ -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"