From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 9 Oct 2023 21:22:10 +0000 (-0400)
Subject: qa/distros: bump container-hosts from centos 8 to 9
X-Git-Tag: v18.2.4~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6dfa6bc8493d55d2b72118e9f302d3ce51dd6144;p=ceph-ci.git

qa/distros: bump container-hosts from centos 8 to 9

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit bac9e74abf0f5cb60c74640d6c4689169acf7abe)
(cherry picked from commit 78dead6e384f436cab2c763ea801966dea57100d)
---

diff --git a/qa/distros/container-hosts/centos_9.stream_container_tools.yaml b/qa/distros/container-hosts/centos_9.stream_container_tools.yaml
new file mode 100644
index 00000000000..eb542a92cc8
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream_container_tools.yaml
@@ -0,0 +1,14 @@
+os_type: centos
+os_version: "9.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/container-hosts/centos_9.stream_container_tools_crun.yaml b/qa/distros/container-hosts/centos_9.stream_container_tools_crun.yaml
new file mode 100644
index 00000000000..1dafe321690
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream_container_tools_crun.yaml
@@ -0,0 +1,16 @@
+os_type: centos
+os_version: "9.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
+    - sudo sed -i 's/runtime = "runc"/#runtime = "runc"/g' /usr/share/containers/containers.conf
+    - sudo sed -i 's/#runtime = "crun"/runtime = "crun"/g' /usr/share/containers/containers.conf
diff --git a/qa/distros/single-container-host.yaml b/qa/distros/single-container-host.yaml
index f71756d42e8..dbda08f27f7 120000
--- a/qa/distros/single-container-host.yaml
+++ b/qa/distros/single-container-host.yaml
@@ -1 +1 @@
-container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file
+container-hosts/centos_9.stream_container_tools_crun.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/.qa b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa
new file mode 120000
index 00000000000..fea2489fdf6
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml
deleted file mode 120000
index 83fe02026e1..00000000000
--- a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_container_tools_crun.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_container_tools_crun.yaml
new file mode 120000
index 00000000000..52bac4e665e
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_container_tools_crun.yaml
@@ -0,0 +1 @@
+.qa/distros/container-hosts/centos_9.stream_container_tools_crun.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 bb9a220e698..00000000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
+++ /dev/null
@@ -1,39 +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: quay.io/ceph/ceph:v16.2.0
-    cephadm_branch: v16.2.0
-    cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-    avoid_pacific_features: true
-
-roles:
-- - mon.a
-  - mon.c
-  - mgr.y
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-  - 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
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 00000000000..7e9a6ea6870
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml
@@ -0,0 +1,39 @@
+os_type: centos
+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: quay.io/ceph/ceph:v16.2.0
+    cephadm_branch: v16.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+    avoid_pacific_features: true
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - 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