]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests 32244/head
authorMichael Fritch <mfritch@suse.com>
Fri, 13 Dec 2019 14:33:54 +0000 (07:33 -0700)
committerMichael Fritch <mfritch@suse.com>
Fri, 13 Dec 2019 14:44:34 +0000 (07:44 -0700)
Signed-off-by: Michael Fritch <mfritch@suse.com>
cephadm-adoption-corpus
qa/workunits/cephadm/test_cephadm.sh

index 63c15675e0e16f559a1ee4ef7db8b58f07c6c126..80c2e76549e35651ac7d7ee17e6badaee42dc866 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 63c15675e0e16f559a1ee4ef7db8b58f07c6c126
+Subproject commit 80c2e76549e35651ac7d7ee17e6badaee42dc866
index ad7f799d4575a34be0ee1ca05da77dd1e305c031..20cb382fb016ad475b2e47d4718ec974c571dc8d 100755 (executable)
@@ -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