qa: new kubic distro files; use kubic podman for centos/rhel

The current centos/rhel version of podman (2.2.1) is broken.

- create new qa/distros/podman/* files that install kubic podman
- include centos/rhel variants
- adjust cephadm jobs to use new yaml files
- remove old qa/distros/all/*_podman.yaml files

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 11beb7287084b56ac7cbd45ac3d28b3d9fa4cc5b)

diff --git a/qa/distros/all/ubuntu_18.04_podman.yaml b/qa/distros/all/ubuntu_18.04_podman.yaml
deleted file mode 100644 (file)
index 214e964..0000000
--- a/qa/distros/all/ubuntu_18.04_podman.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-os_type: ubuntu
-os_version: "18.04"
-
-# feel free to remove this test, if Kubic project is no longer maintained.
-tasks:
-- exec:
-    all:
-    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/Release.key | sudo apt-key add -
-    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-    - sudo apt update
-    - sudo apt -y install podman
-    - 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

diff --git a/qa/distros/all/ubuntu_20.04_podman.yaml b/qa/distros/all/ubuntu_20.04_podman.yaml
deleted file mode 100644 (file)
index bd57bbf..0000000
--- a/qa/distros/all/ubuntu_20.04_podman.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"
-
-# feel free to remove this test, if Kubic project is no longer maintained.
-tasks:
-- exec:
-    all:
-    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/Release.key | sudo apt-key add -
-    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-    - sudo apt update
-    - sudo apt -y install podman
-    - 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

diff --git a/qa/distros/all/ubuntu_20.04_podman_testing.yaml b/qa/distros/all/ubuntu_20.04_podman_testing.yaml
deleted file mode 100644 (file)
index 5656703..0000000
--- a/qa/distros/all/ubuntu_20.04_podman_testing.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"
-
-# feel free to remove this test, if Kubic project is no longer maintained.
-tasks:
-- exec:
-    all:
-    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/Release.key | sudo apt-key add -
-    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list
-    - sudo apt update
-    - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman
-    - 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

diff --git a/qa/distros/podman/centos_8.2_kubic_stable.yaml b/qa/distros/podman/centos_8.2_kubic_stable.yaml
new file mode 100644 (file)
index 0000000..dde0c53
--- /dev/null
+++ b/qa/distros/podman/centos_8.2_kubic_stable.yaml
@@ -0,0 +1,16 @@
+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

diff --git a/qa/distros/podman/rhel_8.3_kubic_stable.yaml b/qa/distros/podman/rhel_8.3_kubic_stable.yaml
new file mode 100644 (file)
index 0000000..817dd3b
--- /dev/null
+++ b/qa/distros/podman/rhel_8.3_kubic_stable.yaml
@@ -0,0 +1,16 @@
+os_type: rhel
+os_version: "8.3"
+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

diff --git a/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml b/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml
new file mode 100644 (file)
index 0000000..214e964
--- /dev/null
+++ b/qa/distros/podman/ubuntu_18.04_kubic_stable.yaml
@@ -0,0 +1,12 @@
+os_type: ubuntu
+os_version: "18.04"
+
+# feel free to remove this test, if Kubic project is no longer maintained.
+tasks:
+- exec:
+    all:
+    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/Release.key | sudo apt-key add -
+    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+    - sudo apt update
+    - sudo apt -y install podman
+    - 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

diff --git a/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml
new file mode 100644 (file)
index 0000000..bd57bbf
--- /dev/null
+++ b/qa/distros/podman/ubuntu_20.04_kubic_stable.yaml
@@ -0,0 +1,12 @@
+os_type: ubuntu
+os_version: "20.04"
+
+# feel free to remove this test, if Kubic project is no longer maintained.
+tasks:
+- exec:
+    all:
+    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/Release.key | sudo apt-key add -
+    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+    - sudo apt update
+    - sudo apt -y install podman
+    - 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

diff --git a/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml
new file mode 100644 (file)
index 0000000..5656703
--- /dev/null
+++ b/qa/distros/podman/ubuntu_20.04_kubic_testing.yaml
@@ -0,0 +1,12 @@
+os_type: ubuntu
+os_version: "20.04"
+
+# feel free to remove this test, if Kubic project is no longer maintained.
+tasks:
+- exec:
+    all:
+    - curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/Release.key | sudo apt-key add -
+    - echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_20.04/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list
+    - sudo apt update
+    - sudo apt -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install podman
+    - 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

diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml
deleted file mode 120000 (symlink)
index f07a2bd..0000000
--- a/qa/suites/rados/cephadm/smoke/distro/centos_8.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/centos_8.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
new file mode 120000 (symlink)
index 0000000..3afeed7
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.2_kubic_stable.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/rados/cephadm/smoke/distro/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml
new file mode 120000 (symlink)
index 0000000..20f0f7c
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/rhel_8.3_kubic_stable.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml
deleted file mode 120000 (symlink)
index be3103a..0000000
--- a/qa/suites/rados/cephadm/smoke/distro/rhel_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/rhel_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml
new file mode 120000 (symlink)
index 0000000..065bb1a
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/ubuntu_20.04_kubic_stable.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml
new file mode 120000 (symlink)
index 0000000..36a5ad1
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/ubuntu_20.04_kubic_testing.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_podman_testing.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_podman_testing.yaml
deleted file mode 120000 (symlink)
index 7391f89..0000000
--- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_podman_testing.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04_podman_testing.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro b/qa/suites/rados/cephadm/thrash/0-distro
new file mode 120000 (symlink)
index 0000000..f0db8bb
--- /dev/null
+++ b/qa/suites/rados/cephadm/thrash/0-distro
@@ -0,0 +1 @@
+../workunits/0-distro
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/.qa b/qa/suites/rados/cephadm/thrash/0-distro/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/centos_8.0.yaml b/qa/suites/rados/cephadm/thrash/0-distro/centos_8.0.yaml
deleted file mode 120000 (symlink)
index f07a2bd..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/centos_8.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/centos_8.0.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/centos_latest.yaml b/qa/suites/rados/cephadm/thrash/0-distro/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/rhel_latest.yaml b/qa/suites/rados/cephadm/thrash/0-distro/rhel_latest.yaml
deleted file mode 120000 (symlink)
index be3103a..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/rhel_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/rhel_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_20.04.yaml b/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_20.04.yaml
deleted file mode 120000 (symlink)
index 1629648..0000000
--- a/qa/suites/rados/cephadm/thrash/0-distro/ubuntu_20.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/thrash/3-tasks.yaml/rados_api_tests.yaml b/qa/suites/rados/cephadm/thrash/3-tasks.yaml/rados_api_tests.yaml
new file mode 120000 (symlink)
index 0000000..47e3355
--- /dev/null
+++ b/qa/suites/rados/cephadm/thrash/3-tasks.yaml/rados_api_tests.yaml
@@ -0,0 +1 @@
+../../../thrash/workloads/rados_api_tests.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/0-distro b/qa/suites/rados/cephadm/with-work/0-distro
new file mode 120000 (symlink)
index 0000000..92c9153
--- /dev/null
+++ b/qa/suites/rados/cephadm/with-work/0-distro
@@ -0,0 +1 @@
+../smoke/distro/
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/.qa b/qa/suites/rados/cephadm/with-work/distro/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml b/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml
deleted file mode 120000 (symlink)
index f07a2bd..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/centos_8.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/centos_8.0.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml b/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml b/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml
deleted file mode 120000 (symlink)
index be3103a..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/rhel_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/rhel_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04.yaml
deleted file mode 120000 (symlink)
index 1629648..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04_podman_testing.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04_podman_testing.yaml
deleted file mode 120000 (symlink)
index 7391f89..0000000
--- a/qa/suites/rados/cephadm/with-work/distro/ubuntu_20.04_podman_testing.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04_podman_testing.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/0-distro/.qa b/qa/suites/rados/cephadm/workunits/0-distro/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/0-distro/.qa
@@ -0,0 +1 @@
+../.qa
\ 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
new file mode 120000 (symlink)
index 0000000..3afeed7
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml
@@ -0,0 +1 @@
+.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/ubuntu_20.04_kubic_stable.yaml b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml
new file mode 120000 (symlink)
index 0000000..065bb1a
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_stable.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/ubuntu_20.04_kubic_stable.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml
new file mode 120000 (symlink)
index 0000000..36a5ad1
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/0-distro/ubuntu_20.04_kubic_testing.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/ubuntu_20.04_kubic_testing.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/distro/.qa b/qa/suites/rados/cephadm/workunits/distro/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/rados/cephadm/workunits/distro/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml b/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/rados/cephadm/workunits/distro/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/distro/ubuntu_20.04_podman_testing.yaml b/qa/suites/rados/cephadm/workunits/distro/ubuntu_20.04_podman_testing.yaml
deleted file mode 120000 (symlink)
index 7391f89..0000000
--- a/qa/suites/rados/cephadm/workunits/distro/ubuntu_20.04_podman_testing.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04_podman_testing.yaml
\ No newline at end of file