qa/suites/crimson-rados: enable cephadm tests

This commit enables cephadm tests in the crimson suites. To
do the same, we make use of --osd-type flag to deploy crimson
OSDs.

Fixes: https://tracker.ceph.com/issues/71946
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

diff --git a/qa/clusters/crimson/crimson-fixed-2.yaml b/qa/clusters/crimson/crimson-fixed-2.yaml
index 58d6f193cd4bc979401f225ed1680d0f1a97be70..caaf391e08758893aa505f44b93bfa51927e163a 100644 (file)
--- a/qa/clusters/crimson/crimson-fixed-2.yaml
+++ b/qa/clusters/crimson/crimson-fixed-2.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
+- [mon.a, mgr.x, osd.0, osd.1, client.0, node-exporter.a]
+- [osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
 overrides:
   ceph:
     conf:

diff --git a/qa/suites/crimson-rados/basic/deploy/cephadm.yaml b/qa/suites/crimson-rados/basic/deploy/cephadm.yaml
new file mode 100644 (file)
index 0000000..0cf3de8
--- /dev/null
+++ b/qa/suites/crimson-rados/basic/deploy/cephadm.yaml
@@ -0,0 +1,17 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    osd_type: crimson
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled
deleted file mode 100644 (file)
index 0c20622..0000000
--- a/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-# no need to verify os + flavor + sha1
-verify_ceph_hash: false
-tasks:
-- cephadm:
-    conf:
-      mgr:
-        debug ms: 1
-        debug mgr: 20
-        debug osd: 10
-- cephadm.shell:
-    mon.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/perf/deploy/cephadm.yaml b/qa/suites/crimson-rados/perf/deploy/cephadm.yaml
new file mode 100644 (file)
index 0000000..0cf3de8
--- /dev/null
+++ b/qa/suites/crimson-rados/perf/deploy/cephadm.yaml
@@ -0,0 +1,17 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    osd_type: crimson
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/perf/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/perf/deploy/cephadm.yaml.disabled
deleted file mode 100644 (file)
index 0c20622..0000000
--- a/qa/suites/crimson-rados/perf/deploy/cephadm.yaml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-# no need to verify os + flavor + sha1
-verify_ceph_hash: false
-tasks:
-- cephadm:
-    conf:
-      mgr:
-        debug ms: 1
-        debug mgr: 20
-        debug osd: 10
-- cephadm.shell:
-    mon.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml b/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml
new file mode 100644 (file)
index 0000000..0cf3de8
--- /dev/null
+++ b/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml
@@ -0,0 +1,17 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    osd_type: crimson
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled
deleted file mode 100644 (file)
index 0c20622..0000000
--- a/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-# no need to verify os + flavor + sha1
-verify_ceph_hash: false
-tasks:
-- cephadm:
-    conf:
-      mgr:
-        debug ms: 1
-        debug mgr: 20
-        debug osd: 10
-- cephadm.shell:
-    mon.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml b/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml
new file mode 100644 (file)
index 0000000..0cf3de8
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml
@@ -0,0 +1,17 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    osd_type: crimson
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls

diff --git a/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml.disabled
deleted file mode 100644 (file)
index 0c20622..0000000
--- a/qa/suites/crimson-rados/thrash/deploy/cephadm.yaml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-# no need to verify os + flavor + sha1
-verify_ceph_hash: false
-tasks:
-- cephadm:
-    conf:
-      mgr:
-        debug ms: 1
-        debug mgr: 20
-        debug osd: 10
-- cephadm.shell:
-    mon.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 2fbe527e3029edc4b0d1df565287ba928aa29cd2..4e34dcf768f1be0cdad87504e304b19ea9e31eca 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1107,6 +1107,9 @@ def ceph_osds(ctx, config):
             osd_cmd = ['ceph', 'orch', 'apply', 'osd', '--all-available-devices']
             if raw:
                 osd_cmd.extend(['--method', 'raw'])
+            osd_type = config.get('osd_type')
+            if osd_type:
+                osd_cmd.extend(['--osd-type', osd_type])
             _shell(ctx, cluster_name, remote, osd_cmd)
             # expect the number of scratch devs
             num_osds = sum(map(len, devs_by_remote.values()))
@@ -1139,6 +1142,21 @@ def ceph_osds(ctx, config):
         pass
 
 
+@contextlib.contextmanager
+def check_enable_crimson(ctx, config):
+    """
+    Enable crimson-related flags if crimson_compat is set.
+    """
+    cluster_name = config['cluster']
+    if config.get('crimson_compat', False):
+        log.info('Enabling crimson flags...')
+        remote = ctx.ceph[cluster_name].bootstrap_remote
+        _shell(ctx, cluster_name, remote, [
+            'ceph', 'osd', 'set-allow-crimson', '--yes-i-really-mean-it'
+        ])
+    yield
+
+
 @contextlib.contextmanager
 def ceph_mdss(ctx, config):
     """
@@ -2006,6 +2024,7 @@ def task(ctx, config):
             lambda: module_setup(ctx=ctx, config=config),
             lambda: ceph_mgrs(ctx=ctx, config=config),
             lambda: conf_setup(ctx=ctx, config=config),
+            lambda: check_enable_crimson(ctx=ctx, config=config),
             lambda: ceph_osds(ctx=ctx, config=config),
             lambda: ceph_mdss(ctx=ctx, config=config),
             lambda: cephfs_setup(ctx=ctx, config=config),