From 7e51535369cac06f0793b1d1330c40f85c9ba3d6 Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 7 Feb 2022 13:18:17 -0500 Subject: [PATCH] qa/suites/rados/cephadm: remove centos 8.2, 8.3 Signed-off-by: Adam King --- .../podman/centos_8.2_container_tools_3.0.yaml | 14 -------------- .../podman/centos_8.3_container_tools_3.0.yaml | 14 -------------- .../distro/centos_8.2_container_tools_3.0.yaml | 1 - .../upgrade/1-start-distro/1-start-centos_8.yaml | 13 ------------- .../0-distro/centos_8.2_container_tools_3.0.yaml | 1 - 5 files changed, 43 deletions(-) delete mode 100644 qa/distros/podman/centos_8.2_container_tools_3.0.yaml delete mode 100644 qa/distros/podman/centos_8.3_container_tools_3.0.yaml delete mode 120000 qa/suites/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml delete mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml delete mode 120000 qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml diff --git a/qa/distros/podman/centos_8.2_container_tools_3.0.yaml b/qa/distros/podman/centos_8.2_container_tools_3.0.yaml deleted file mode 100644 index 6d27d157b16d7..0000000000000 --- a/qa/distros/podman/centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: centos -os_version: "8.2" -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/centos_8.3_container_tools_3.0.yaml b/qa/distros/podman/centos_8.3_container_tools_3.0.yaml deleted file mode 100644 index e2cad5e20ab82..0000000000000 --- a/qa/distros/podman/centos_8.3_container_tools_3.0.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: centos -os_version: "8.3" -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/suites/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml deleted file mode 120000 index d1965f3d65957..0000000000000 --- a/qa/suites/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml deleted file mode 100644 index 5d380ad787f33..0000000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- cephadm: - image: docker.io/ceph/ceph:v15.2.9 - cephadm_branch: v15.2.9 - cephadm_git_url: https://github.com/ceph/ceph - # avoid --cap-add=PTRACE + --privileged for older cephadm versions - allow_ptrace: false -os_type: centos -os_version: "8.2" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 diff --git a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml deleted file mode 120000 index d1965f3d65957..0000000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file -- 2.39.5