From 6dfa6bc8493d55d2b72118e9f302d3ce51dd6144 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 9 Oct 2023 17:22:10 -0400 Subject: [PATCH] qa/distros: bump container-hosts from centos 8 to 9 Signed-off-by: Casey Bodley (cherry picked from commit bac9e74abf0f5cb60c74640d6c4689169acf7abe) (cherry picked from commit 78dead6e384f436cab2c763ea801966dea57100d) --- .../centos_9.stream_container_tools.yaml | 14 ++++++++++++++ .../centos_9.stream_container_tools_crun.yaml | 16 ++++++++++++++++ qa/distros/single-container-host.yaml | 2 +- qa/suites/orch/cephadm/smoke-small/0-distro/.qa | 1 + .../centos_8.stream_container_tools_crun.yaml | 1 - .../centos_9.stream_container_tools_crun.yaml | 1 + ...1-start-centos_9.stream_container-tools.yaml} | 2 +- 7 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 qa/distros/container-hosts/centos_9.stream_container_tools.yaml create mode 100644 qa/distros/container-hosts/centos_9.stream_container_tools_crun.yaml create mode 120000 qa/suites/orch/cephadm/smoke-small/0-distro/.qa delete mode 120000 qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml create mode 120000 qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_container_tools_crun.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} (97%) 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 0000000000000..eb542a92cc878 --- /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 0000000000000..1dafe3216908f --- /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 f71756d42e874..dbda08f27f74e 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 0000000000000..fea2489fdf6d9 --- /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 83fe02026e1b6..0000000000000 --- 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 0000000000000..52bac4e665e9d --- /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_9.stream_container-tools.yaml similarity index 97% 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 bb9a220e69864..7e9a6ea68706f 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,5 +1,5 @@ os_type: centos -os_version: "8.stream" +os_version: "9.stream" tasks: - pexec: -- 2.39.5