From 2f19ef545d6d77ffed8df848ad2771e3013ff31c Mon Sep 17 00:00:00 2001 From: Adam King Date: Tue, 23 Jul 2024 17:25:50 -0400 Subject: [PATCH] qa/cephadm: drop centos 8 and rhel 8.6 from test distros Since we don't build either of these any more on quincy Signed-off-by: Adam King --- .../podman/centos_8.stream_container_tools.yaml | 14 -------------- .../podman/rhel_8.6_container_tools_3.0.yaml | 13 ------------- .../podman/rhel_8.6_container_tools_rhel8.yaml | 13 ------------- .../supported-container-hosts/ubuntu_20.04.yaml | 1 + .../supported-container-hosts/ubuntu_22.04.yaml | 1 - .../mds_upgrade_sequence/centos_9.stream.yaml | 1 + qa/suites/fs/workload/0-centos_9.stream.yaml | 1 + .../0-centos_8.stream_container_tools.yaml | 1 - .../cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml | 1 + ...> 1-start-centos_9.stream_container-tools.yaml} | 8 +------- 10 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 qa/distros/podman/centos_8.stream_container_tools.yaml delete mode 100644 qa/distros/podman/rhel_8.6_container_tools_3.0.yaml delete mode 100644 qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml create mode 120000 qa/distros/supported-container-hosts/ubuntu_20.04.yaml delete mode 120000 qa/distros/supported-container-hosts/ubuntu_22.04.yaml create mode 120000 qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml create mode 120000 qa/suites/fs/workload/0-centos_9.stream.yaml delete mode 120000 qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml create mode 120000 qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml rename qa/suites/orch/cephadm/upgrade/1-start-distro/{1-start-centos_8.stream_container-tools.yaml => 1-start-centos_9.stream_container-tools.yaml} (70%) diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml deleted file mode 100644 index 4a76306f19d..00000000000 --- a/qa/distros/podman/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1,14 +0,0 @@ -os_type: centos -os_version: "8.stream" -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 --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 deleted file mode 100644 index 361d8546e2b..00000000000 --- a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index be94ed69e7d..00000000000 --- a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/qa/distros/supported-container-hosts/ubuntu_20.04.yaml b/qa/distros/supported-container-hosts/ubuntu_20.04.yaml new file mode 120000 index 00000000000..c75c905576e --- /dev/null +++ b/qa/distros/supported-container-hosts/ubuntu_20.04.yaml @@ -0,0 +1 @@ +../container-hosts/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/distros/supported-container-hosts/ubuntu_22.04.yaml b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml deleted file mode 120000 index 01afa8a63a2..00000000000 --- a/qa/distros/supported-container-hosts/ubuntu_22.04.yaml +++ /dev/null @@ -1 +0,0 @@ -../container-hosts/ubuntu_22.04.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml new file mode 120000 index 00000000000..dca92ddbf45 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/0-centos_9.stream.yaml b/qa/suites/fs/workload/0-centos_9.stream.yaml new file mode 120000 index 00000000000..dca92ddbf45 --- /dev/null +++ b/qa/suites/fs/workload/0-centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f02..00000000000 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml new file mode 120000 index 00000000000..dca92ddbf45 --- /dev/null +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml similarity index 70% rename from qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml rename to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml index a1a9cb5effc..790999883aa 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml @@ -1,13 +1,7 @@ os_type: centos -os_version: "8.stream" +os_version: "9.stream" 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 - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf - cephadm: image: docker.io/ceph/ceph:v15.2.0 cephadm_branch: v15.2.0 -- 2.47.3