From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 20:18:15 +0000 (-0600)
Subject: qa/suites/rados: move cephadm_orchestrator to el8
X-Git-Tag: v15.1.0~388^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32407%2Fhead;p=ceph.git

qa/suites/rados: move cephadm_orchestrator to el8

The python3-remoto dependency does not exist on 18.04 (or any ubuntu or
debian AFAICS).

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

diff --git a/qa/suites/rados/mgr/tasks/cephadm_orchestrator.yaml b/qa/suites/rados/mgr/tasks/cephadm_orchestrator.yaml
deleted file mode 100644
index 6b88bfb4b550..000000000000
--- a/qa/suites/rados/mgr/tasks/cephadm_orchestrator.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\)
-        - \(MGR_INSIGHTS_WARNING\)
-        - \(insights_health_check
-        - \(PG_
-        - replacing it with standby
-        - No standby daemons available
-  - cephfs_test_runner:
-      modules:
-        - tasks.mgr.test_cephadm_orchestrator
diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/+ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa b/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml
new file mode 120000
index 000000000000..8a0b9123b382
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/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/singleton-flat/cephadm_orchestrator/centos_latest.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml
new file mode 120000
index 000000000000..bd9854e70298
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml
new file mode 100644
index 000000000000..6b88bfb4b550
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.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\)
+        - \(MGR_INSIGHTS_WARNING\)
+        - \(insights_health_check
+        - \(PG_
+        - replacing it with standby
+        - No standby daemons available
+  - cephfs_test_runner:
+      modules:
+        - tasks.mgr.test_cephadm_orchestrator
diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml
new file mode 120000
index 000000000000..651e5f8a89e6
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml
@@ -0,0 +1 @@
+.qa/debug/mgr.yaml
\ No newline at end of file