From: Sage Weil <sage@newdream.net>
Date: Mon, 8 Nov 2021 17:01:45 +0000 (-0600)
Subject: qa/suites/orch/cephadm: add 8.stream + container_tools
X-Git-Tag: v15.2.16~7^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f05d76cb6b751c328a654204c39583de4ed844f;p=ceph.git

qa/suites/orch/cephadm: add 8.stream + container_tools

Signed-off-by: Sage Weil <sage@newdream.net>

Conflicts:
	qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
---

diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml
new file mode 100644
index 0000000000000..4a9578e60d492
--- /dev/null
+++ b/qa/distros/podman/centos_8.stream_container_tools.yaml
@@ -0,0 +1,14 @@
+os_type: centos
+os_version: "8.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
+    - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_8.stream_container_tools.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.stream_container_tools.yaml
new file mode 120000
index 0000000000000..7a86f967f0203
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/centos_8.stream_container_tools.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
new file mode 100644
index 0000000000000..539a47b3bedd9
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
@@ -0,0 +1,13 @@
+tasks:
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.9
+    cephadm_branch: v15.2.9
+    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.stream"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
diff --git a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml
new file mode 120000
index 0000000000000..7a86f967f0203
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file