From: Adam King <adking@redhat.com>
Date: Tue, 23 Jul 2024 21:25:50 +0000 (-0400)
Subject: qa/cephadm: drop centos 8 and rhel 8.6 from test distros
X-Git-Tag: v17.2.8~12^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f19ef545d6d77ffed8df848ad2771e3013ff31c;p=ceph.git

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 <adking@redhat.com>
---

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 4a76306f19d59..0000000000000
--- 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 361d8546e2b7d..0000000000000
--- 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 be94ed69e7d6f..0000000000000
--- 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 0000000000000..c75c905576e1d
--- /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 01afa8a63a242..0000000000000
--- 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 0000000000000..dca92ddbf45e5
--- /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 0000000000000..dca92ddbf45e5
--- /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 7a86f967f0203..0000000000000
--- 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 0000000000000..dca92ddbf45e5
--- /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_8.stream_container-tools.yaml
deleted file mode 100644
index a1a9cb5effc7b..0000000000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-os_type: centos
-os_version: "8.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
-    cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-    # deploy additional mons the "old" (octopus) way
-    add_mons_via_daemon_add: true
-    avoid_pacific_features: true
-
-roles:
-- - mon.a
-  - mon.c
-  - mgr.y
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-#   - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
-  - node-exporter.a
-  - alertmanager.a
-- - mon.b
-  - mgr.x
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.1
-  - prometheus.a
-  - grafana.a
-  - node-exporter.b
-#  - ceph.iscsi.iscsi.a  # needs later start point
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml
new file mode 100644
index 0000000000000..790999883aa60
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml
@@ -0,0 +1,37 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.0
+    cephadm_branch: v15.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+    # deploy additional mons the "old" (octopus) way
+    add_mons_via_daemon_add: true
+    avoid_pacific_features: true
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+#   - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
+#  - ceph.iscsi.iscsi.a  # needs later start point