From: Michael Fritch <mfritch@suse.com>
Date: Fri, 13 Dec 2019 14:33:54 +0000 (-0700)
Subject: qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests
X-Git-Tag: v15.1.0~499^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32244%2Fhead;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/cephadm-adoption-corpus b/cephadm-adoption-corpus
index 63c15675e0e16..80c2e76549e35 160000
--- a/cephadm-adoption-corpus
+++ b/cephadm-adoption-corpus
@@ -1 +1 @@
-Subproject commit 63c15675e0e16f559a1ee4ef7db8b58f07c6c126
+Subproject commit 80c2e76549e35651ac7d7ee17e6badaee42dc866
diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index ad7f799d4575a..20cb382fb016a 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -196,7 +196,6 @@ done
 # WRITE ME
 
 ## adopt
-if false; then
 for tarball in $TEST_TARS; do
     TMP_TAR_DIR=`mktemp -d -p $TMPDIR`
     $SUDO tar xzvf $tarball -C $TMP_TAR_DIR
@@ -216,7 +215,6 @@ for tarball in $TEST_TARS; do
     $CEPHADM rm-cluster --fsid $FSID_LEGACY --force
     $SUDO rm -rf $TMP_TAR_DIR
 done
-fi
 
 ## unit
 $CEPHADM unit --fsid $FSID --name mon.a -- is-enabled