qa: remove container hosts install from centos 9 distros

We needed the container-hosts version of podman on centos 8,
but there's no need to keep using it in centos 9

Additionally, changes from crun variants to runc variants since
crun is now the default container runtime on centos 9

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c8873c6591d368e12907669c274fd3d6391e3f68)
(cherry picked from commit 1dbc8e4b6790b7d385d4df2b8a552bd2076026e7)

diff --git a/qa/distros/container-hosts/centos_9.stream.yaml b/qa/distros/container-hosts/centos_9.stream.yaml
new file mode 100644 (file)
index 0000000..d3bc430
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream.yaml
@@ -0,0 +1,7 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+

diff --git a/qa/distros/container-hosts/centos_9.stream_container_tools.yaml b/qa/distros/container-hosts/centos_9.stream_container_tools.yaml
deleted file mode 100644 (file)
index eb542a9..0000000
--- a/qa/distros/container-hosts/centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644 (file)
index 1dafe32..0000000
--- a/qa/distros/container-hosts/centos_9.stream_container_tools_crun.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-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/container-hosts/centos_9.stream_runc.yaml b/qa/distros/container-hosts/centos_9.stream_runc.yaml
new file mode 100644 (file)
index 0000000..2e4f9fe
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream_runc.yaml
@@ -0,0 +1,13 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+
+tasks:
+- pexec:
+    all:
+    - sudo dnf install runc -y
+    - sudo sed -i 's/^#runtime = "crun"/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/podman/centos_9.stream.yaml b/qa/distros/podman/centos_9.stream.yaml
new file mode 100644 (file)
index 0000000..d3bc430
--- /dev/null
+++ b/qa/distros/podman/centos_9.stream.yaml
@@ -0,0 +1,7 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+

diff --git a/qa/distros/podman/centos_9.stream_container_tools.yaml b/qa/distros/podman/centos_9.stream_container_tools.yaml
deleted file mode 100644 (file)
index eb542a9..0000000
--- a/qa/distros/podman/centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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/single-container-host.yaml b/qa/distros/single-container-host.yaml
index dbda08f27f74e6f10bd3e1ea95934ed02532f47a..08e1be9c25d589165955d86f797a95e16ae6cde1 120000 (symlink)
--- a/qa/distros/single-container-host.yaml
+++ b/qa/distros/single-container-host.yaml
@@ -1 +1 @@
-container-hosts/centos_9.stream_container_tools_crun.yaml
\ No newline at end of file
+container-hosts/centos_9.stream.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream_container_tools.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream_container_tools.yaml
deleted file mode 120000 (symlink)
index 0ad8250..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_9.stream_container_tools.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 (symlink)
index 0000000..dca92dd
--- /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/fs/workload/0-centos_9.stream_container_tools.yaml b/qa/suites/fs/workload/0-centos_9.stream_container_tools.yaml
deleted file mode 120000 (symlink)
index 0ad8250..0000000
--- a/qa/suites/fs/workload/0-centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_9.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 (symlink)
index 0000000..dca92dd
--- /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/mgr-nfs-upgrade/0-centos_9.stream_container_tools.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream_container_tools.yaml
deleted file mode 120000 (symlink)
index 0ad8250..0000000
--- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_9.stream_container_tools.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
deleted file mode 120000 (symlink)
index 52bac4e..0000000
--- a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_container_tools_crun.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/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/centos_9.stream_runc.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml
new file mode 120000 (symlink)
index 0000000..5ef2595
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml
@@ -0,0 +1 @@
+.qa/distros/container-hosts/centos_9.stream_runc.yaml
\ No newline at end of file

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
new file mode 100644 (file)
index 0000000..6272eb0
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream.yaml
@@ -0,0 +1,33 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- 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
deleted file mode 100644 (file)
index 7e9a6ea..0000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_9.stream_container-tools.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-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

diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml
new file mode 120000 (symlink)
index 0000000..dca92dd
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/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/workunits/task/test_iscsi_container/centos_9.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream_container_tools.yaml
deleted file mode 120000 (symlink)
index 0ad8250..0000000
--- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_9.stream_container_tools.yaml
\ No newline at end of file