qa: Default to RHEL8.6 instead of 8.5

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/qa/distros/all/rhel_8.6.yaml b/qa/distros/all/rhel_8.6.yaml
new file mode 100644 (file)
index 0000000..34c3f10
--- /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 8d7a275b852e45f5734fb92bcf4351e4ecb55681..d49c09cc174e2daf0d206c877e211f2cf0be7692 120000 (symlink)
--- 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.5_container_tools_3.0.yaml
deleted file mode 100644 (file)
index dd25013..0000000
--- a/qa/distros/container-hosts/rhel_8.5_container_tools_3.0.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml
deleted file mode 100644 (file)
index 2cad6f7..0000000
--- a/qa/distros/container-hosts/rhel_8.5_container_tools_rhel8.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
new file mode 100644 (file)
index 0000000..b226053
--- /dev/null
+++ b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.6"
+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
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
new file mode 100644 (file)
index 0000000..a5c0bbf
--- /dev/null
+++ b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.6"
+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
+    - 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
deleted file mode 100644 (file)
index dd25013..0000000
--- a/qa/distros/podman/rhel_8.5_container_tools_3.0.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-    - 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
deleted file mode 100644 (file)
index 2cad6f7..0000000
--- a/qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml
new file mode 100644 (file)
index 0000000..b226053
--- /dev/null
+++ b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.6"
+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
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
new file mode 100644 (file)
index 0000000..a5c0bbf
--- /dev/null
+++ b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
@@ -0,0 +1,13 @@
+os_type: rhel
+os_version: "8.6"
+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
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/suites/fs/workload/0-rhel_8.yaml b/qa/suites/fs/workload/0-rhel_8.yaml
index ba18b2ea9cb278910c7272a85dccc4f3570bd9ca..c9abcd7b83f370103b91dd598fa583d6c0e0827e 120000 (symlink)
--- 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