From a3015ff78afecadb147298226c7b41fbfbe873e9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 25 Jan 2024 12:41:39 -0500 Subject: [PATCH] qa/distros: add supported-container-hosts for cephadm and upgrade suites Signed-off-by: Casey Bodley (cherry picked from commit 849a58b0873154a6713b4c8d838634f13b0b806d) Conflicts: qa/suites/upgrade/telemetry-upgrade/quincy-x/0-random-distro$ --- qa/distros/supported-container-hosts/centos_9.stream.yaml | 1 + qa/distros/supported-container-hosts/centos_9.stream_runc.yaml | 1 + qa/distros/supported-container-hosts/ubuntu_22.04.yaml | 1 + qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ | 2 +- qa/suites/orch/cephadm/osds/0-distro | 2 +- qa/suites/orch/cephadm/smoke-roleless/0-distro | 2 +- qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ | 2 +- qa/suites/orch/cephadm/smoke/0-distro | 2 +- qa/suites/orch/cephadm/thrash/0-distro | 2 +- qa/suites/orch/cephadm/with-work/0-distro | 2 +- qa/suites/orch/cephadm/workunits/0-distro | 2 +- qa/suites/upgrade/octopus-x/parallel/0-distro | 2 +- qa/suites/upgrade/octopus-x/stress-split/0-distro | 2 +- qa/suites/upgrade/pacific-x/parallel/0-random-distro$ | 2 +- qa/suites/upgrade/pacific-x/stress-split/0-distro | 2 +- 15 files changed, 15 insertions(+), 12 deletions(-) create mode 120000 qa/distros/supported-container-hosts/centos_9.stream.yaml create mode 120000 qa/distros/supported-container-hosts/centos_9.stream_runc.yaml create mode 120000 qa/distros/supported-container-hosts/ubuntu_22.04.yaml diff --git a/qa/distros/supported-container-hosts/centos_9.stream.yaml b/qa/distros/supported-container-hosts/centos_9.stream.yaml new file mode 120000 index 00000000000..584cad6777d --- /dev/null +++ b/qa/distros/supported-container-hosts/centos_9.stream.yaml @@ -0,0 +1 @@ +../container-hosts/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml new file mode 120000 index 00000000000..81b17ea1450 --- /dev/null +++ b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml @@ -0,0 +1 @@ +../container-hosts/centos_9.stream_runc.yaml \ No newline at end of file diff --git a/qa/distros/supported-container-hosts/ubuntu_22.04.yaml b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml new file mode 120000 index 00000000000..01afa8a63a2 --- /dev/null +++ b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml @@ -0,0 +1 @@ +../container-hosts/ubuntu_22.04.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ +++ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/osds/0-distro b/qa/suites/orch/cephadm/osds/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/osds/0-distro +++ b/qa/suites/orch/cephadm/osds/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-roleless/0-distro b/qa/suites/orch/cephadm/smoke-roleless/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/smoke-roleless/0-distro +++ b/qa/suites/orch/cephadm/smoke-roleless/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ +++ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/0-distro b/qa/suites/orch/cephadm/smoke/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/smoke/0-distro +++ b/qa/suites/orch/cephadm/smoke/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/thrash/0-distro b/qa/suites/orch/cephadm/thrash/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/thrash/0-distro +++ b/qa/suites/orch/cephadm/thrash/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/with-work/0-distro b/qa/suites/orch/cephadm/with-work/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/with-work/0-distro +++ b/qa/suites/orch/cephadm/with-work/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro b/qa/suites/orch/cephadm/workunits/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/orch/cephadm/workunits/0-distro +++ b/qa/suites/orch/cephadm/workunits/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/parallel/0-distro b/qa/suites/upgrade/octopus-x/parallel/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/upgrade/octopus-x/parallel/0-distro +++ b/qa/suites/upgrade/octopus-x/parallel/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro b/qa/suites/upgrade/octopus-x/stress-split/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/upgrade/octopus-x/stress-split/0-distro +++ b/qa/suites/upgrade/octopus-x/stress-split/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ b/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ index 4b341719de4..66187855738 120000 --- a/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ +++ b/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file diff --git a/qa/suites/upgrade/pacific-x/stress-split/0-distro b/qa/suites/upgrade/pacific-x/stress-split/0-distro index 4b341719de4..66187855738 120000 --- a/qa/suites/upgrade/pacific-x/stress-split/0-distro +++ b/qa/suites/upgrade/pacific-x/stress-split/0-distro @@ -1 +1 @@ -.qa/distros/container-hosts \ No newline at end of file +.qa/distros/supported-container-hosts \ No newline at end of file -- 2.47.3