From 14c3f6fdae79d1b55aefdcabdb9ecb55092d0887 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 8 Jun 2022 15:07:09 -0400 Subject: [PATCH] qa: Default to RHEL8.6 instead of 8.5 Signed-off-by: David Galloway (cherry picked from commit b8c4488c558e1f824af1aae3fa14ac7ae1a366b1) --- qa/distros/all/rhel_8.6.yaml | 6 ++++++ qa/distros/all/rhel_8.yaml | 2 +- ...ner_tools_3.0.yaml => rhel_8.6_container_tools_3.0.yaml} | 2 +- ...tools_rhel8.yaml => rhel_8.6_container_tools_rhel8.yaml} | 2 +- ...ner_tools_3.0.yaml => rhel_8.6_container_tools_3.0.yaml} | 2 +- ...tools_rhel8.yaml => rhel_8.6_container_tools_rhel8.yaml} | 2 +- qa/suites/fs/workload/0-rhel_8.yaml | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 qa/distros/all/rhel_8.6.yaml rename qa/distros/container-hosts/{rhel_8.5_container_tools_3.0.yaml => rhel_8.6_container_tools_3.0.yaml} (95%) rename qa/distros/container-hosts/{rhel_8.5_container_tools_rhel8.yaml => rhel_8.6_container_tools_rhel8.yaml} (95%) rename qa/distros/podman/{rhel_8.5_container_tools_3.0.yaml => rhel_8.6_container_tools_3.0.yaml} (95%) rename qa/distros/podman/{rhel_8.5_container_tools_rhel8.yaml => rhel_8.6_container_tools_rhel8.yaml} (95%) diff --git a/qa/distros/all/rhel_8.6.yaml b/qa/distros/all/rhel_8.6.yaml new file mode 100644 index 0000000000000..34c3f10bea354 --- /dev/null +++ b/qa/distros/all/rhel_8.6.yaml @@ -0,0 +1,6 @@ +os_type: rhel +os_version: "8.6" +overrides: + selinux: + whitelist: + - scontext=system_u:system_r:logrotate_t:s0 diff --git a/qa/distros/all/rhel_8.yaml b/qa/distros/all/rhel_8.yaml index 8d7a275b852e4..d49c09cc174e2 120000 --- a/qa/distros/all/rhel_8.yaml +++ b/qa/distros/all/rhel_8.yaml @@ -1 +1 @@ -rhel_8.5.yaml \ No newline at end of file +rhel_8.6.yaml \ No newline at end of file diff --git a/qa/distros/container-hosts/rhel_8.5_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml similarity index 95% rename from qa/distros/container-hosts/rhel_8.5_container_tools_3.0.yaml rename to qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml index 72d438057219e..361d8546e2b7d 100644 --- a/qa/distros/container-hosts/rhel_8.5_container_tools_3.0.yaml +++ b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.5" +os_version: "8.6" overrides: selinux: whitelist: diff --git a/qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml similarity index 95% rename from qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml rename to qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml index 3eddae82f6e56..be94ed69e7d6f 100644 --- a/qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml +++ b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.5" +os_version: "8.6" overrides: selinux: whitelist: diff --git a/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml similarity index 95% rename from qa/distros/podman/rhel_8.5_container_tools_3.0.yaml rename to qa/distros/podman/rhel_8.6_container_tools_3.0.yaml index 72d438057219e..361d8546e2b7d 100644 --- a/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml +++ b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.5" +os_version: "8.6" overrides: selinux: whitelist: diff --git a/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml similarity index 95% rename from qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml rename to qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml index 3eddae82f6e56..be94ed69e7d6f 100644 --- a/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml +++ b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.5" +os_version: "8.6" overrides: selinux: whitelist: diff --git a/qa/suites/fs/workload/0-rhel_8.yaml b/qa/suites/fs/workload/0-rhel_8.yaml index ba18b2ea9cb27..c9abcd7b83f37 120000 --- a/qa/suites/fs/workload/0-rhel_8.yaml +++ b/qa/suites/fs/workload/0-rhel_8.yaml @@ -1 +1 @@ -.qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml \ No newline at end of file +.qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml \ No newline at end of file -- 2.39.5