From 1a227dfb8c1504a408dccc3a41e61b06e9bb4883 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 20 Jan 2022 11:29:52 +0100 Subject: [PATCH] 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 --- qa/distros/.qa | 1 + qa/distros/all/ubuntu_20.04.yaml | 7 ------- .../cephadm/smoke/distro => distros/container-hosts}/.qa | 0 .../container-hosts}/centos_8.2_container_tools_3.0.yaml | 0 .../container-hosts}/centos_8.3_container_tools_3.0.yaml | 0 .../centos_8.stream_container_tools.yaml | 0 .../container-hosts}/rhel_8.4_container_tools_3.0.yaml | 0 .../container-hosts}/rhel_8.4_container_tools_rhel8.yaml | 0 .../distro => distros/container-hosts}/ubuntu_18.04.yaml | 0 qa/distros/container-hosts/ubuntu_20.04.yaml | 9 +++++++++ qa/suites/orch/cephadm/smoke/distro | 1 + qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml | 1 - 12 files changed, 11 insertions(+), 8 deletions(-) create mode 120000 qa/distros/.qa rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/.qa (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/centos_8.2_container_tools_3.0.yaml (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/centos_8.3_container_tools_3.0.yaml (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/centos_8.stream_container_tools.yaml (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/rhel_8.4_container_tools_3.0.yaml (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/rhel_8.4_container_tools_rhel8.yaml (100%) rename qa/{suites/orch/cephadm/smoke/distro => distros/container-hosts}/ubuntu_18.04.yaml (100%) create mode 100644 qa/distros/container-hosts/ubuntu_20.04.yaml create mode 120000 qa/suites/orch/cephadm/smoke/distro delete mode 120000 qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml diff --git a/qa/distros/.qa b/qa/distros/.qa new file mode 120000 index 0000000000000..b870225aa053e --- /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 bb9f5c00a0989..f2039823003f2 100644 --- 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/suites/orch/cephadm/smoke/distro/.qa b/qa/distros/container-hosts/.qa similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/.qa rename to qa/distros/container-hosts/.qa diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml b/qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml rename to qa/distros/container-hosts/centos_8.2_container_tools_3.0.yaml diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml b/qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/centos_8.3_container_tools_3.0.yaml rename to qa/distros/container-hosts/centos_8.3_container_tools_3.0.yaml diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml rename to qa/distros/container-hosts/centos_8.stream_container_tools.yaml diff --git a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_3.0.yaml rename to qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml diff --git a/qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/rhel_8.4_container_tools_rhel8.yaml rename to qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml diff --git a/qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml b/qa/distros/container-hosts/ubuntu_18.04.yaml similarity index 100% rename from qa/suites/orch/cephadm/smoke/distro/ubuntu_18.04.yaml rename to qa/distros/container-hosts/ubuntu_18.04.yaml diff --git a/qa/distros/container-hosts/ubuntu_20.04.yaml b/qa/distros/container-hosts/ubuntu_20.04.yaml new file mode 100644 index 0000000000000..bb9f5c00a0989 --- /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 index 0000000000000..be53a48336498 --- /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/ubuntu_20.04.yaml b/qa/suites/orch/cephadm/smoke/distro/ubuntu_20.04.yaml deleted file mode 120000 index 162964882d383..0000000000000 --- 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 -- 2.39.5