From: Adam King Date: Thu, 30 Nov 2023 22:14:59 +0000 (-0500) Subject: qa: remove container hosts install from centos 9 distros X-Git-Tag: v18.2.4~20 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9dcccf6679ce0d4980ff179aae1c187f3b7c5a0c;p=ceph.git 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 (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 index 0000000000000..d3bc430e63b98 --- /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 index eb542a92cc878..0000000000000 --- 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 index 1dafe3216908f..0000000000000 --- 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 index 0000000000000..2e4f9fe3a61e8 --- /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 index 0000000000000..d3bc430e63b98 --- /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 index eb542a92cc878..0000000000000 --- 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 dbda08f27f74e..08e1be9c25d58 120000 --- 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 index 0ad8250bb8557..0000000000000 --- 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 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/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 index 0ad8250bb8557..0000000000000 --- 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 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/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 index 0ad8250bb8557..0000000000000 --- 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 index 52bac4e665e9d..0000000000000 --- 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 index 0000000000000..5ef2595cf7407 --- /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 index 0000000000000..6272eb0f1fbd2 --- /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 index 7e9a6ea68706f..0000000000000 --- 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 index 0000000000000..dca92ddbf45e5 --- /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 index 0ad8250bb8557..0000000000000 --- 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