qa: Latest RHEL8 -> RHEL8.5

Signed-off-by: David Galloway <dgallowa@redhat.com>
(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

diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml
new file mode 100644 (file)
index 0000000..12713a4
--- /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 c7867a423f65911a1d376c47e5b6b6ae43b7b7e2..8d7a275b852e45f5734fb92bcf4351e4ecb55681 120000 (symlink)
--- 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.4_container_tools_3.0.yaml
deleted file mode 100644 (file)
index 01b1ad5..0000000
--- a/qa/distros/podman/rhel_8.4_container_tools_3.0.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-os_type: rhel
-os_version: "8.4"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
-tasks:
-- pexec:
-    all:
-    - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
-    - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:3.0 --allowerasing --nobest
-    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml
deleted file mode 100644 (file)
index 741868e..0000000
--- a/qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-os_type: rhel
-os_version: "8.4"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
-tasks:
-- pexec:
-    all:
-    - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
-    - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:rhel8 --allowerasing --nobest
-    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml
new file mode 100644 (file)
index 0000000..72d4380
--- /dev/null
+++ b/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.5"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+tasks:
+- pexec:
+    all:
+    - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
+    - sudo dnf -y  module reset container-tools
+    - sudo dnf -y  module install container-tools:3.0 --allowerasing --nobest
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml
new file mode 100644 (file)
index 0000000..3eddae8
--- /dev/null
+++ b/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.5"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+tasks:
+- pexec:
+    all:
+    - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
+    - sudo dnf -y  module reset container-tools
+    - sudo dnf -y  module install container-tools:rhel8 --allowerasing --nobest
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf