From a745659c3a0b18f29af297df26ac5fb69742c95f Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 31 Mar 2022 12:13:19 -0400 Subject: [PATCH] qa: Latest RHEL8 -> RHEL8.5 Signed-off-by: David Galloway (cherry picked from commit fcd512b50b03f3a10c971bb224fc53dbcb45d78b) Conflicts: qa/distros/container-hosts/ stuff was under qa/distros/podman/ qa/suites/fs/workload/0-rhel_8.yaml does not exist --- qa/distros/all/rhel_8.5.yaml | 6 ++++++ qa/distros/all/rhel_8.yaml | 2 +- ...ner_tools_3.0.yaml => rhel_8.5_container_tools_3.0.yaml} | 2 +- ...tools_rhel8.yaml => rhel_8.5_container_tools_rhel8.yaml} | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 qa/distros/all/rhel_8.5.yaml rename qa/distros/podman/{rhel_8.4_container_tools_3.0.yaml => rhel_8.5_container_tools_3.0.yaml} (95%) rename qa/distros/podman/{rhel_8.4_container_tools_rhel8.yaml => rhel_8.5_container_tools_rhel8.yaml} (95%) diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml new file mode 100644 index 0000000000000..12713a45e5a66 --- /dev/null +++ b/qa/distros/all/rhel_8.5.yaml @@ -0,0 +1,6 @@ +os_type: rhel +os_version: "8.5" +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 c7867a423f659..8d7a275b852e4 120000 --- a/qa/distros/all/rhel_8.yaml +++ b/qa/distros/all/rhel_8.yaml @@ -1 +1 @@ -rhel_8.4.yaml \ No newline at end of file +rhel_8.5.yaml \ No newline at end of file diff --git a/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml similarity index 95% rename from qa/distros/podman/rhel_8.4_container_tools_3.0.yaml rename to qa/distros/podman/rhel_8.5_container_tools_3.0.yaml index 01b1ad51ebb3a..72d438057219e 100644 --- a/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml +++ b/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.4" +os_version: "8.5" overrides: selinux: whitelist: diff --git a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml similarity index 95% rename from qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml rename to qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml index 741868eb4f661..3eddae82f6e56 100644 --- a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml +++ b/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml @@ -1,5 +1,5 @@ os_type: rhel -os_version: "8.4" +os_version: "8.5" overrides: selinux: whitelist: -- 2.39.5