From: David Galloway <dgallowa@redhat.com>
Date: Wed, 8 Jun 2022 19:07:09 +0000 (-0400)
Subject: qa: Default to RHEL8.6 instead of 8.5
X-Git-Tag: v16.2.15~55^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cd6b9d73dd85d9ad0bda6428f2960710849687d;p=ceph.git

qa: Default to RHEL8.6 instead of 8.5

Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit b8c4488c558e1f824af1aae3fa14ac7ae1a366b1)

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.6.yaml b/qa/distros/all/rhel_8.6.yaml
new file mode 100644
index 00000000000..34c3f10bea3
--- /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 8d7a275b852..d49c09cc174 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/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
index 72d43805721..00000000000
--- 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 --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
deleted file mode 100644
index 3eddae82f6e..00000000000
--- 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 --allowerasing --nobest
-    - 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
index 00000000000..361d8546e2b
--- /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 --allowerasing --nobest
+    - 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
index 00000000000..be94ed69e7d
--- /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 --allowerasing --nobest
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf