ceph-daemon: move standalone test tgz to corpus

Fixes: https://tracker.ceph.com/issues/42876
Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/ceph-daemon-adoption-corpus b/ceph-daemon-adoption-corpus
index 50f61c06e96ac46825e2c7257ff4b936299b6a55..63c15675e0e16f559a1ee4ef7db8b58f07c6c126 160000 (submodule)
--- 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 2f7e5956b2b7475bcbb07ab7b92c018f6739f3f2..361e4d87beeda8f2fcabb4a13dd328ff2c84de48 100755 (executable)
--- 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 (file)
index cbf4ae5..0000000
Binary files a/qa/standalone/test_ceph_daemon/deepsea.tgz and /dev/null differ