From f4de8738ca86b7b31998718b53c8b7659fcdd27f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 3 Mar 2021 08:18:19 -0600
Subject: [PATCH] qa/suites/rados/cephadm/upgrade: use kubic on centos

Signed-off-by: Sage Weil <sage@newdream.net>
---
 .../1-start-distro/1-start-centos_8.yaml      | 13 ----------
 .../1-start-centos_8_kubic_stable.yaml        | 24 +++++++++++++++++++
 .../1-start-centos_8_kubic_testing.yaml       | 23 ++++++++++++++++++
 .../1-start-distro/1-start-ubuntu_20.04.yaml  |  5 ++--
 4 files changed, 50 insertions(+), 15 deletions(-)
 delete mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
 create mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml
 create mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml

diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
deleted file mode 100644
index 14c803a9a2c..00000000000
--- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- cephadm:
-    image: docker.io/ceph/ceph:v15.2.5
-    cephadm_branch: v15.2.5
-    cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-os_type: centos
-os_version: "8.2"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml
new file mode 100644
index 00000000000..3779371dd09
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml
@@ -0,0 +1,24 @@
+os_type: centos
+os_version: "8.2"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+
+tasks:
+- exec:
+    all:
+    - 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
+
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.5
+    cephadm_branch: v15.2.5
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+
diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml
new file mode 100644
index 00000000000..a3794f6f701
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml
@@ -0,0 +1,23 @@
+os_type: centos
+os_version: "8.2"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+
+tasks:
+- exec:
+    all:
+    - 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:testing.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/CentOS_8/devel:kubic:libcontainers:testing.repo
+    - sudo dnf remove -y podman
+    - sudo dnf -y install podman
+
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.5
+    cephadm_branch: v15.2.5
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
index 0ad5a32d373..f9bd9879267 100644
--- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
@@ -1,3 +1,6 @@
+os_type: ubuntu
+os_version: "20.04"
+
 tasks:
 - cephadm:
     image: docker.io/ceph/ceph:v15.2.0
@@ -5,5 +8,3 @@ tasks:
     cephadm_git_url: https://github.com/ceph/ceph
     # avoid --cap-add=PTRACE + --privileged for older cephadm versions
     allow_ptrace: false
-os_type: ubuntu
-os_version: "20.04"
-- 
2.39.5