From: Michael Fritch Date: Wed, 4 Dec 2019 22:50:46 +0000 (-0700) Subject: ceph-daemon: move standalone test tgz to corpus X-Git-Tag: v15.1.0~564^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a0eed4cb84b989f101f4227acccb148d20c56e54;p=ceph-ci.git ceph-daemon: move standalone test tgz to corpus Fixes: https://tracker.ceph.com/issues/42876 Signed-off-by: Michael Fritch --- diff --git a/ceph-daemon-adoption-corpus b/ceph-daemon-adoption-corpus index 50f61c06e96..63c15675e0e 160000 --- a/ceph-daemon-adoption-corpus +++ b/ceph-daemon-adoption-corpus @@ -1 +1 @@ -Subproject commit 50f61c06e96ac46825e2c7257ff4b936299b6a55 +Subproject commit 63c15675e0e16f559a1ee4ef7db8b58f07c6c126 diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index 2f7e5956b2b..361e4d87bee 100755 --- a/qa/standalone/test_ceph_daemon.sh +++ b/qa/standalone/test_ceph_daemon.sh @@ -11,7 +11,9 @@ IMAGE_MASTER=${IMAGE_MASTER:-'ceph/daemon-base:latest-master-devel'} IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'ceph/daemon-base:latest-nautilus'} IMAGE_MIMIC=${IMAGE_MIMIC:-'ceph/daemon-base:latest-mimic'} -TEST_TARS=${SCRIPT_DIR}/test_ceph_daemon/*.tgz +CORPUS_GIT_SUBMOD="ceph-daemon-adoption-corpus" +CORPUS_DIR=${SCRIPT_DIR}/../../${CORPUS_GIT_SUBMOD}/archive +TEST_TARS=$(find ${CORPUS_DIR} -type f -iname *.tgz) OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img" OSD_IMAGE_SIZE='6G' diff --git a/qa/standalone/test_ceph_daemon/deepsea.tgz b/qa/standalone/test_ceph_daemon/deepsea.tgz deleted file mode 100644 index cbf4ae566fc..00000000000 Binary files a/qa/standalone/test_ceph_daemon/deepsea.tgz and /dev/null differ