From: David Galloway Date: Thu, 31 Mar 2022 16:13:19 +0000 (-0400) Subject: qa: Latest RHEL8 -> RHEL8.5 X-Git-Tag: v18.0.0~1114^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcd512b50b03f3a10c971bb224fc53dbcb45d78b;p=ceph.git qa: Latest RHEL8 -> RHEL8.5 Signed-off-by: David Galloway --- diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml new file mode 100644 index 00000000000..12713a45e5a --- /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 c7867a423f6..8d7a275b852 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/container-hosts/rhel_8.4_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_3.0.yaml deleted file mode 100644 index a01eec95228..00000000000 --- a/qa/distros/container-hosts/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 - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.4_container_tools_rhel8.yaml deleted file mode 100644 index fdce9e83749..00000000000 --- a/qa/distros/container-hosts/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 - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf 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 new file mode 100644 index 00000000000..dd25013118b --- /dev/null +++ b/qa/distros/container-hosts/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 + - 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 new file mode 100644 index 00000000000..2cad6f7798d --- /dev/null +++ b/qa/distros/container-hosts/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 + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf 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 index a01eec95228..00000000000 --- 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 - - 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 index fdce9e83749..00000000000 --- 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 - - 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 index 00000000000..dd25013118b --- /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 + - 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 index 00000000000..2cad6f7798d --- /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 + - 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 b4b0a7892ce..ba18b2ea9cb 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.4_container_tools_rhel8.yaml \ No newline at end of file +.qa/distros/podman/rhel_8.5_container_tools_rhel8.yaml \ No newline at end of file