From: Guillaume Abrioux Date: Thu, 20 Jan 2022 10:29:52 +0000 (+0100) Subject: qa: split distro for rados/cephadm/smoke tests X-Git-Tag: v16.2.8~245^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44681%2Fhead;p=ceph.git 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 --- diff --git a/qa/distros/.qa b/qa/distros/.qa new file mode 120000 index 000000000000..b870225aa053 --- /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 bb9f5c00a098..f2039823003f 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/distros/container-hosts/.qa b/qa/distros/container-hosts/.qa new file mode 120000 index 000000000000..fea2489fdf6d --- /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 index 000000000000..d1965f3d6595 --- /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 index 000000000000..479a5c26e451 --- /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 index 000000000000..7a86f967f020 --- /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 index 000000000000..9e1ab9a0e2a9 --- /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 index 000000000000..b4b0a7892ce1 --- /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 index 000000000000..cfb85f10ef59 --- /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 index 000000000000..bb9f5c00a098 --- /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 000000000000..be53a4833649 --- /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 index fea2489fdf6d..000000000000 --- 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 index d1965f3d6595..000000000000 --- 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 479a5c26e451..000000000000 --- 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 7a86f967f020..000000000000 --- 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 9e1ab9a0e2a9..000000000000 --- 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 b4b0a7892ce1..000000000000 --- 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 index cfb85f10ef59..000000000000 --- 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 index 162964882d38..000000000000 --- 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