From 88da4c38d4415d6d3bd9e8a4e479a24716136a00 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 16 Nov 2021 09:53:28 -0600 Subject: [PATCH] qa/suites: use distros/container-hosts/ Signed-off-by: Sage Weil --- 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/distro => smoke-singlehost}/.qa | 0 qa/suites/orch/cephadm/smoke-singlehost/0-distro$ | 1 - qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ | 1 + qa/suites/orch/cephadm/smoke/0-distro | 1 + .../cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml | 1 - .../cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml | 1 - .../cephadm/smoke/distro/centos_8.stream_container_tools.yaml | 1 - .../orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml | 1 - .../cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml | 1 - qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml | 1 - qa/suites/orch/cephadm/thrash/0-distro | 2 +- qa/suites/orch/cephadm/with-work/0-distro | 2 +- qa/suites/orch/cephadm/workunits/0-distro/.qa | 1 - .../workunits/0-distro/centos_8.2_container_tools_3.0.yaml | 1 - .../workunits/0-distro/centos_8.stream_container_tools.yaml | 1 - 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-distro$ | 1 - qa/suites/upgrade/pacific-x/parallel/0-random-distro$ | 1 + qa/suites/upgrade/pacific-x/stress-split/0-distro | 2 +- 23 files changed, 11 insertions(+), 19 deletions(-) rename qa/suites/orch/cephadm/{smoke/distro => smoke-singlehost}/.qa (100%) delete mode 120000 qa/suites/orch/cephadm/smoke-singlehost/0-distro$ create mode 120000 qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ create mode 120000 qa/suites/orch/cephadm/smoke/0-distro delete mode 120000 qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml delete mode 120000 qa/suites/orch/cephadm/workunits/0-distro/.qa delete mode 120000 qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml delete mode 120000 qa/suites/upgrade/pacific-x/parallel/0-distro$ create mode 120000 qa/suites/upgrade/pacific-x/parallel/0-random-distro$ diff --git a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ index d2dffb18188..4b341719de4 120000 --- a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ +++ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ @@ -1 +1 @@ -../smoke/distro \ No newline at end of file +.qa/distros/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 d2dffb18188..4b341719de4 120000 --- a/qa/suites/orch/cephadm/osds/0-distro +++ b/qa/suites/orch/cephadm/osds/0-distro @@ -1 +1 @@ -../smoke/distro \ No newline at end of file +.qa/distros/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 d2dffb18188..4b341719de4 120000 --- a/qa/suites/orch/cephadm/smoke-roleless/0-distro +++ b/qa/suites/orch/cephadm/smoke-roleless/0-distro @@ -1 +1 @@ -../smoke/distro \ No newline at end of file +.qa/distros/container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/.qa b/qa/suites/orch/cephadm/smoke-singlehost/.qa similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/.qa rename to qa/suites/orch/cephadm/smoke-singlehost/.qa diff --git a/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ b/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ deleted file mode 120000 index d2dffb18188..00000000000 --- a/qa/suites/orch/cephadm/smoke-singlehost/0-distro$ +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro \ 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$ new file mode 120000 index 00000000000..4b341719de4 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ @@ -0,0 +1 @@ +.qa/distros/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 new file mode 120000 index 00000000000..4b341719de4 --- /dev/null +++ b/qa/suites/orch/cephadm/smoke/0-distro @@ -0,0 +1 @@ +.qa/distros/container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml deleted file mode 120000 index d1965f3d659..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml deleted file mode 120000 index 479a5c26e45..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.3_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f02..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml b/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml deleted file mode 120000 index 9e1ab9a0e2a..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/rhel_8.4_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml b/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml deleted file mode 120000 index b4b0a7892ce..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml b/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml deleted file mode 120000 index 162964882d3..00000000000 --- a/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_20.04.yaml \ 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 f0db8bb61f8..4b341719de4 120000 --- a/qa/suites/orch/cephadm/thrash/0-distro +++ b/qa/suites/orch/cephadm/thrash/0-distro @@ -1 +1 @@ -../workunits/0-distro \ No newline at end of file +.qa/distros/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 92c9153eac7..4b341719de4 120000 --- a/qa/suites/orch/cephadm/with-work/0-distro +++ b/qa/suites/orch/cephadm/with-work/0-distro @@ -1 +1 @@ -../smoke/distro/ \ No newline at end of file +.qa/distros/container-hosts \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/.qa b/qa/suites/orch/cephadm/workunits/0-distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/orch/cephadm/workunits/0-distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml deleted file mode 120000 index d1965f3d659..00000000000 --- a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f02..00000000000 --- a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml \ 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 fb247fda1b3..4b341719de4 120000 --- a/qa/suites/upgrade/octopus-x/parallel/0-distro +++ b/qa/suites/upgrade/octopus-x/parallel/0-distro @@ -1 +1 @@ -../../../rados/cephadm/smoke/distro/ \ No newline at end of file +.qa/distros/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 f8438813523..4b341719de4 120000 --- a/qa/suites/upgrade/octopus-x/stress-split/0-distro +++ b/qa/suites/upgrade/octopus-x/stress-split/0-distro @@ -1 +1 @@ -../../../rados/cephadm/smoke/distro \ No newline at end of file +.qa/distros/container-hosts \ No newline at end of file diff --git a/qa/suites/upgrade/pacific-x/parallel/0-distro$ b/qa/suites/upgrade/pacific-x/parallel/0-distro$ deleted file mode 120000 index fb247fda1b3..00000000000 --- a/qa/suites/upgrade/pacific-x/parallel/0-distro$ +++ /dev/null @@ -1 +0,0 @@ -../../../rados/cephadm/smoke/distro/ \ 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$ new file mode 120000 index 00000000000..4b341719de4 --- /dev/null +++ b/qa/suites/upgrade/pacific-x/parallel/0-random-distro$ @@ -0,0 +1 @@ +.qa/distros/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 f8438813523..4b341719de4 120000 --- a/qa/suites/upgrade/pacific-x/stress-split/0-distro +++ b/qa/suites/upgrade/pacific-x/stress-split/0-distro @@ -1 +1 @@ -../../../rados/cephadm/smoke/distro \ No newline at end of file +.qa/distros/container-hosts \ No newline at end of file -- 2.39.5