From 34a2bb449501dd1f8322ac8ce49d805ee2190282 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Fri, 13 Dec 2019 07:33:54 -0700 Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests Signed-off-by: Michael Fritch --- cephadm-adoption-corpus | 2 +- qa/workunits/cephadm/test_cephadm.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cephadm-adoption-corpus b/cephadm-adoption-corpus index 63c15675e0e..80c2e76549e 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 ad7f799d457..20cb382fb01 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 -- 2.39.5