From bade5ada5119e0bdfabc386f8fbcbf5e70e4ab21 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 20 Aug 2021 10:53:11 +0200 Subject: [PATCH] qa/distro: Add centos_8.2_container_tools_3.0.yaml Let's avoid latest kubic stable Fixes: https://tracker.ceph.com/issues/52279 Signed-off-by: Sebastian Wagner (cherry picked from commit e436483c77adf7f876533c25a11c14d19a2d32a4) Conflicts: qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml --- .../podman/centos_8.2_container_tools_3.0.yaml | 14 ++++++++++++++ qa/distros/podman/centos_8.2_kubic_stable.yaml | 18 ------------------ .../centos_8.2_container_tools_3.0.yaml | 1 + .../0-distro/centos_8.2_kubic_stable.yaml | 1 - .../smoke/distro/centos_8.2_kubic_stable.yaml | 1 - .../centos_8.2_container_tools_3.0.yaml | 1 + .../0-distro/centos_8.2_kubic_stable.yaml | 1 - .../centos_8.2_container_tools_3.0.yaml | 1 + 8 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 qa/distros/podman/centos_8.2_container_tools_3.0.yaml delete mode 100644 qa/distros/podman/centos_8.2_kubic_stable.yaml create mode 120000 qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml delete mode 120000 qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml create mode 120000 qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml delete mode 120000 qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml create mode 120000 qa/suites/rados/dashboard/centos_8.2_container_tools_3.0.yaml diff --git a/qa/distros/podman/centos_8.2_container_tools_3.0.yaml b/qa/distros/podman/centos_8.2_container_tools_3.0.yaml new file mode 100644 index 0000000000000..6d27d157b16d7 --- /dev/null +++ b/qa/distros/podman/centos_8.2_container_tools_3.0.yaml @@ -0,0 +1,14 @@ +os_type: centos +os_version: "8.2" +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 + - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/distros/podman/centos_8.2_kubic_stable.yaml b/qa/distros/podman/centos_8.2_kubic_stable.yaml deleted file mode 100644 index 22fbc1997a74b..0000000000000 --- a/qa/distros/podman/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1,18 +0,0 @@ -os_type: centos -os_version: "8.2" -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 disable container-tools - - sudo dnf -y install 'dnf-command(copr)' - - sudo dnf -y copr enable rhcontainerbot/container-selinux - - sudo curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo - - sudo dnf remove -y podman - - sudo dnf -y install podman - - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf diff --git a/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.yaml new file mode 120000 index 0000000000000..d1965f3d65957 --- /dev/null +++ b/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d5099..0000000000000 --- a/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d5099..0000000000000 --- a/qa/suites/orch/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml new file mode 120000 index 0000000000000..d1965f3d65957 --- /dev/null +++ b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_container_tools_3.0.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d5099..0000000000000 --- a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/dashboard/centos_8.2_container_tools_3.0.yaml b/qa/suites/rados/dashboard/centos_8.2_container_tools_3.0.yaml new file mode 120000 index 0000000000000..d1965f3d65957 --- /dev/null +++ b/qa/suites/rados/dashboard/centos_8.2_container_tools_3.0.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_8.2_container_tools_3.0.yaml \ No newline at end of file -- 2.39.5