qa/suites/rados: test cephadm on centos and ubuntu both

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

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

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

diff --git a/qa/suites/rados/singleton-flat/cephadm/cephadm.yaml b/qa/suites/rados/singleton-flat/cephadm/cephadm.yaml
new file mode 100644 (file)
index 0000000..4d25351
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm/cephadm.yaml
@@ -0,0 +1,11 @@
+roles:
+- [mon.a, mgr.x, osd.0, client.0]
+tasks:
+- install:
+- exec:
+    mon.a:
+      - yum install -y python3 || apt install -y python3
+- workunit:
+    clients:
+      client.0:
+        - cephadm/test_cephadm.sh

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

diff --git a/qa/suites/rados/singleton-flat/cephadm/distro/centos_latest.yaml b/qa/suites/rados/singleton-flat/cephadm/distro/centos_latest.yaml
new file mode 120000 (symlink)
index 0000000..bd9854e
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm/distro/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/distro/ubuntu_latest.yaml b/qa/suites/rados/singleton-flat/cephadm/distro/ubuntu_latest.yaml
new file mode 120000 (symlink)
index 0000000..3a09f9a
--- /dev/null
+++ b/qa/suites/rados/singleton-flat/cephadm/distro/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/singleton-nomsgr/all/cephadm.yaml b/qa/suites/rados/singleton-nomsgr/all/cephadm.yaml
deleted file mode 100644 (file)
index 4d25351..0000000
--- a/qa/suites/rados/singleton-nomsgr/all/cephadm.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, client.0]
-tasks:
-- install:
-- exec:
-    mon.a:
-      - yum install -y python3 || apt install -y python3
-- workunit:
-    clients:
-      client.0:
-        - cephadm/test_cephadm.sh