qa/suites/cephadm: move orchestrator_cli test into rados/cephadm

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/cephadm/orchestrator_cli/% b/qa/suites/rados/cephadm/orchestrator_cli/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/cephadm/orchestrator_cli/.qa b/qa/suites/rados/cephadm/orchestrator_cli/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rados/cephadm/orchestrator_cli/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml b/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml
new file mode 120000 (symlink)
index 0000000..8a0b912
--- /dev/null
+++ b/qa/suites/rados/cephadm/orchestrator_cli/2-node-mgr.yaml
@@ -0,0 +1 @@
+.qa/clusters/2-node-mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml b/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml
new file mode 100644 (file)
index 0000000..d585616
--- /dev/null
+++ b/qa/suites/rados/cephadm/orchestrator_cli/orchestrator_cli.yaml
@@ -0,0 +1,18 @@
+
+tasks:
+  - install:
+  - ceph:
+      # tests may leave mgrs broken, so don't try and call into them
+      # to invoke e.g. pg dump during teardown.
+      wait-for-scrub: false
+      log-whitelist:
+        - overall HEALTH_
+        - \(MGR_DOWN\)
+        - \(DEVICE_IDENT_ON\)
+        - \(DEVICE_FAULT_ON\)
+        - \(PG_
+        - replacing it with standby
+        - No standby daemons available
+  - cephfs_test_runner:
+      modules:
+        - tasks.mgr.test_orchestrator_cli
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/orchestrator_cli/supported-random-distro$ b/qa/suites/rados/cephadm/orchestrator_cli/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..ce3f73a
--- /dev/null
+++ b/qa/suites/rados/cephadm/orchestrator_cli/supported-random-distro$
@@ -0,0 +1 @@
+../../basic/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml b/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml
deleted file mode 100644 (file)
index d585616..0000000
--- a/qa/suites/rados/mgr/tasks/orchestrator_cli.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-tasks:
-  - install:
-  - ceph:
-      # tests may leave mgrs broken, so don't try and call into them
-      # to invoke e.g. pg dump during teardown.
-      wait-for-scrub: false
-      log-whitelist:
-        - overall HEALTH_
-        - \(MGR_DOWN\)
-        - \(DEVICE_IDENT_ON\)
-        - \(DEVICE_FAULT_ON\)
-        - \(PG_
-        - replacing it with standby
-        - No standby daemons available
-  - cephfs_test_runner:
-      modules:
-        - tasks.mgr.test_orchestrator_cli
\ No newline at end of file