qa: split distro for rados/cephadm/smoke tests

There was a difference between master and pacific.
The hwe kernel modification for Ubuntu 20.04 should be done
only for cephadm tests. Modifying `qa/distros/all/ubuntu_20.04.yaml` broke
many tests.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/qa/distros/.qa b/qa/distros/.qa
new file mode 120000 (symlink)
index 0000000..b870225
--- /dev/null
+++ b/qa/distros/.qa
@@ -0,0 +1 @@
+../
\ No newline at end of file

diff --git a/qa/distros/all/ubuntu_20.04.yaml b/qa/distros/all/ubuntu_20.04.yaml
index bb9f5c00a098908a8489a4e5b4efa75e9e9d5cd7..f2039823003f27bfe6a895a72d93445f22cc4c87 100644 (file)
--- a/qa/distros/all/ubuntu_20.04.yaml
+++ b/qa/distros/all/ubuntu_20.04.yaml
@@ -1,9 +1,2 @@
 os_type: ubuntu
 os_version: "20.04"
-# the normal ubuntu 20.04 kernel (5.4.0-88-generic currently) have a bug that prevents the nvme_loop
-# from behaving.  I think it is this:
-#   https://lkml.org/lkml/2020/9/21/1456
-# (at least, that is the symptom: nvme nvme1: Connect command failed, error wo/DNR bit: 880)
-overrides:
-  kernel:
-    hwe: true

diff --git a/qa/distros/container-hosts/.qa b/qa/distros/container-hosts/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/distros/container-hosts/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml b/qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml
new file mode 120000 (symlink)
index 0000000..d1965f3
--- /dev/null
+++ b/qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.2_container_tools_3.0.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml b/qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml
new file mode 120000 (symlink)
index 0000000..479a5c2
--- /dev/null
+++ b/qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.3_container_tools_3.0.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
new file mode 120000 (symlink)
index 0000000..7a86f96
--- /dev/null
+++ b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml
new file mode 120000 (symlink)
index 0000000..9e1ab9a
--- /dev/null
+++ b/qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/rhel_8.4_container_tools_3.0.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml
new file mode 120000 (symlink)
index 0000000..b4b0a78
--- /dev/null
+++ b/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/ubuntu_18.04.yaml b/qa/distros/container-hosts/ubuntu_18.04.yaml
new file mode 120000 (symlink)
index 0000000..cfb85f1
--- /dev/null
+++ b/qa/distros/container-hosts/ubuntu_18.04.yaml
@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_18.04.yaml
\ No newline at end of file

diff --git a/qa/distros/container-hosts/ubuntu_20.04.yaml b/qa/distros/container-hosts/ubuntu_20.04.yaml
new file mode 100644 (file)
index 0000000..bb9f5c0
--- /dev/null
+++ b/qa/distros/container-hosts/ubuntu_20.04.yaml
@@ -0,0 +1,9 @@
+os_type: ubuntu
+os_version: "20.04"
+# the normal ubuntu 20.04 kernel (5.4.0-88-generic currently) have a bug that prevents the nvme_loop
+# from behaving.  I think it is this:
+#   https://lkml.org/lkml/2020/9/21/1456
+# (at least, that is the symptom: nvme nvme1: Connect command failed, error wo/DNR bit: 880)
+overrides:
+  kernel:
+    hwe: true

diff --git a/qa/suites/orch/cephadm/smoke/distro b/qa/suites/orch/cephadm/smoke/distro
new file mode 120000 (symlink)
index 0000000..be53a48
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke/distro
@@ -0,0 +1 @@
+.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/distro/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/orch/cephadm/smoke/distro/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ 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 (symlink)
index d1965f3..0000000
--- 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 (symlink)
index 479a5c2..0000000
--- 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 (symlink)
index 7a86f96..0000000
--- 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 (symlink)
index 9e1ab9a..0000000
--- 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 (symlink)
index b4b0a78..0000000
--- 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_18.04.yaml b/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.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 (symlink)
index 1629648..0000000
--- 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