From 1cd6c5a4158a495919615411024afa5ac0ddf021 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 15 Feb 2024 09:24:23 -0500 Subject: [PATCH] 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 (cherry picked from commit 7953fe1b3920c92c086c981bf4e3d2c41ea7e450) --- qa/suites/orch/cephadm/no-agent-workunits/% | 0 qa/suites/orch/cephadm/no-agent-workunits/.qa | 1 + qa/suites/orch/cephadm/no-agent-workunits/0-distro | 1 + qa/suites/orch/cephadm/no-agent-workunits/mon_election | 1 + .../{workunits => no-agent-workunits}/task/test_adoption.yaml | 0 .../task/test_cephadm_timeout.yaml | 0 .../{workunits => no-agent-workunits}/task/test_orch_cli.yaml | 0 .../task/test_orch_cli_mon.yaml | 0 8 files changed, 3 insertions(+) create mode 100644 qa/suites/orch/cephadm/no-agent-workunits/% create mode 120000 qa/suites/orch/cephadm/no-agent-workunits/.qa create mode 120000 qa/suites/orch/cephadm/no-agent-workunits/0-distro create mode 120000 qa/suites/orch/cephadm/no-agent-workunits/mon_election rename qa/suites/orch/cephadm/{workunits => no-agent-workunits}/task/test_adoption.yaml (100%) rename qa/suites/orch/cephadm/{workunits => no-agent-workunits}/task/test_cephadm_timeout.yaml (100%) rename qa/suites/orch/cephadm/{workunits => no-agent-workunits}/task/test_orch_cli.yaml (100%) rename qa/suites/orch/cephadm/{workunits => no-agent-workunits}/task/test_orch_cli_mon.yaml (100%) 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/workunits/task/test_adoption.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_adoption.yaml similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_adoption.yaml rename to qa/suites/orch/cephadm/no-agent-workunits/task/test_adoption.yaml diff --git a/qa/suites/orch/cephadm/workunits/task/test_cephadm_timeout.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_cephadm_timeout.yaml rename to qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml diff --git a/qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_orch_cli.yaml rename to qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml diff --git a/qa/suites/orch/cephadm/workunits/task/test_orch_cli_mon.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_orch_cli_mon.yaml rename to qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml -- 2.39.5