From: Adam King <adking@redhat.com>
Date: Thu, 15 Feb 2024 14:24:23 +0000 (-0500)
Subject: qa/cephadm: don't test certain workunits with agent
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~175^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1cd6c5a4158a495919615411024afa5ac0ddf021;p=ceph-ci.git

qa/cephadm: don't test certain workunits with agent

There are a handful of workunits that don't work
with or don't make sense with the agent.
The test for the cephadm timeout only works if
the mgr directly runs ceph-volume inventory which
it won't do with the agent present. The adoption
test is just running direct cephadm commands that
are irrelevant to the agent. The test_orch_cli tests
rely on refresh timings that are different with
the agent running, causing spurious failures.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7953fe1b3920c92c086c981bf4e3d2c41ea7e450)
---

diff --git a/qa/suites/orch/cephadm/no-agent-workunits/% b/qa/suites/orch/cephadm/no-agent-workunits/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/.qa b/qa/suites/orch/cephadm/no-agent-workunits/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/0-distro b/qa/suites/orch/cephadm/no-agent-workunits/0-distro
new file mode 120000
index 00000000000..4b341719de4
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/0-distro
@@ -0,0 +1 @@
+.qa/distros/container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/mon_election b/qa/suites/orch/cephadm/no-agent-workunits/mon_election
new file mode 120000
index 00000000000..3f331e6214c
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/mon_election
@@ -0,0 +1 @@
+.qa/mon_election
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_adoption.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_adoption.yaml
new file mode 100644
index 00000000000..e04fc1eea3c
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_adoption.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_adoption.sh
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml
new file mode 100644
index 00000000000..24b53d02912
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml
@@ -0,0 +1,13 @@
+roles:
+- - host.a
+  - mon.a
+  - mgr.a
+  - osd.0
+  - client.0
+tasks:
+- install:
+- cephadm:
+- workunit:
+    clients:
+      client.0:
+        - cephadm/test_cephadm_timeout.py
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml
new file mode 100644
index 00000000000..ec65fb116f7
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml
@@ -0,0 +1,17 @@
+roles:
+- - host.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mon.a
+  - mgr.a
+  - client.0
+tasks:
+- install:
+- cephadm:
+- cephadm.shell:
+    host.a:
+      - ceph orch apply mds a
+- cephfs_test_runner:
+    modules:
+      - tasks.cephadm_cases.test_cli
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml
new file mode 100644
index 00000000000..2a33dc8399c
--- /dev/null
+++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml
@@ -0,0 +1,45 @@
+roles:
+- - host.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mon.a
+  - mgr.a
+  - client.0
+- - host.b
+  - osd.3
+  - osd.4
+  - osd.5
+  - mon.b
+  - mgr.b
+  - client.1
+- - host.c
+  - osd.6
+  - osd.7
+  - osd.8
+  - mon.c
+  - mgr.c
+  - client.2
+- - host.d
+  - osd.9
+  - osd.10
+  - osd.11
+  - mon.d
+  - mgr.d
+  - client.3
+- - host.e
+  - osd.12
+  - osd.13
+  - osd.14
+  - mon.e
+  - mgr.e
+  - client.4
+tasks:
+- install:
+- cephadm:
+- cephadm.shell:
+    host.a:
+      - ceph orch apply mds a
+- cephfs_test_runner:
+    modules:
+      - tasks.cephadm_cases.test_cli_mon
diff --git a/qa/suites/orch/cephadm/workunits/task/test_adoption.yaml b/qa/suites/orch/cephadm/workunits/task/test_adoption.yaml
deleted file mode 100644
index e04fc1eea3c..00000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_adoption.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_adoption.sh
diff --git a/qa/suites/orch/cephadm/workunits/task/test_cephadm_timeout.yaml b/qa/suites/orch/cephadm/workunits/task/test_cephadm_timeout.yaml
deleted file mode 100644
index 24b53d02912..00000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_cephadm_timeout.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-roles:
-- - host.a
-  - mon.a
-  - mgr.a
-  - osd.0
-  - client.0
-tasks:
-- install:
-- cephadm:
-- workunit:
-    clients:
-      client.0:
-        - cephadm/test_cephadm_timeout.py
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml b/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml
deleted file mode 100644
index ec65fb116f7..00000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-roles:
-- - host.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.a
-  - mgr.a
-  - client.0
-tasks:
-- install:
-- cephadm:
-- cephadm.shell:
-    host.a:
-      - ceph orch apply mds a
-- cephfs_test_runner:
-    modules:
-      - tasks.cephadm_cases.test_cli
diff --git a/qa/suites/orch/cephadm/workunits/task/test_orch_cli_mon.yaml b/qa/suites/orch/cephadm/workunits/task/test_orch_cli_mon.yaml
deleted file mode 100644
index 2a33dc8399c..00000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_orch_cli_mon.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-roles:
-- - host.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.a
-  - mgr.a
-  - client.0
-- - host.b
-  - osd.3
-  - osd.4
-  - osd.5
-  - mon.b
-  - mgr.b
-  - client.1
-- - host.c
-  - osd.6
-  - osd.7
-  - osd.8
-  - mon.c
-  - mgr.c
-  - client.2
-- - host.d
-  - osd.9
-  - osd.10
-  - osd.11
-  - mon.d
-  - mgr.d
-  - client.3
-- - host.e
-  - osd.12
-  - osd.13
-  - osd.14
-  - mon.e
-  - mgr.e
-  - client.4
-tasks:
-- install:
-- cephadm:
-- cephadm.shell:
-    host.a:
-      - ceph orch apply mds a
-- cephfs_test_runner:
-    modules:
-      - tasks.cephadm_cases.test_cli_mon