From: Michael Fritch <mfritch@suse.com>
Date: Wed, 4 Dec 2019 22:55:12 +0000 (-0700)
Subject: ceph-daemon: re-enable the OSD standalone test
X-Git-Tag: v15.1.0~564^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4aa7d5582b7e324021c37d602f6c6c583113c229;p=ceph.git

ceph-daemon: re-enable the OSD standalone test

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

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 361e4d87beed..036727923dee 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -200,10 +200,6 @@ for tarball in $TEST_TARS; do
     $SUDO tar xzvf $tarball -C $TMP_TAR_DIR
     NAMES=$($CEPH_DAEMON ls --legacy-dir $TMP_TAR_DIR | jq -r '.[].name')
     for name in $NAMES; do
-        # TODO: skip osd test for now
-        if [[ $name =~ "osd" ]]; then
-           continue
-        fi
         $CEPH_DAEMON adopt \
                 --style legacy \
                 --legacy-dir $TMP_TAR_DIR \