From: Sebastian Wagner <sewagner@redhat.com>
Date: Fri, 20 Aug 2021 08:53:11 +0000 (+0200)
Subject: qa/distro: Add centos_8.2_container_tools_3.0.yaml
X-Git-Tag: v15.2.15~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43102%2Fhead;p=ceph.git

qa/distro: Add centos_8.2_container_tools_3.0.yaml

Let's avoid latest kubic stable

trivial fix: skipped mgr-nfs-upgrade, dashboard symlinks
Fixes: https://tracker.ceph.com/issues/52279
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit e436483c77adf7f876533c25a11c14d19a2d32a4)
---

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 000000000000..6d27d157b16d
--- /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 5ea907f758fa..000000000000
--- a/qa/distros/podman/centos_8.2_kubic_stable.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-os_type: centos
-os_version: "8.2"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
-
-tasks:
-- exec:
-    all:
-    - echo -e "[[registry]]\nlocation = 'docker.io'\n\n[[registry.mirror]]\nlocation='docker-mirror.front.sepia.ceph.com:5000'\n" | sudo tee /etc/containers/registries.conf
-    - 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/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_container_tools_3.0.yaml
new file mode 120000
index 000000000000..d1965f3d6595
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/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/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml
deleted file mode 120000
index 3afeed74d509..000000000000
--- a/qa/suites/rados/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/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml
deleted file mode 120000
index 3afeed74d509..000000000000
--- a/qa/suites/rados/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