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

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

Conflicts:
	qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.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 (file)
index 0000000..4a9578e
--- /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/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml
deleted file mode 120000 (symlink)
index 479a5c2..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.3_container_tools_3.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_8.3_container_tools_3.0.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml
new file mode 120000 (symlink)
index 0000000..7a86f96
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/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/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
deleted file mode 120000 (symlink)
index d1965f3..0000000
--- a/qa/suites/orch/cephadm/dashboard/0-distro/centos_8.2_container_tools_3.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_8.2_container_tools_3.0.yaml
\ No newline at end of file

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml
new file mode 120000 (symlink)
index 0000000..7a86f96
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-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/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/smoke/distro/centos_8.stream_container_tools.yaml
new file mode 120000 (symlink)
index 0000000..7a86f96
--- /dev/null
+++ b/qa/suites/orch/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/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml
deleted file mode 100644 (file)
index 2e551dd..0000000
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.3-octopus.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-os_type: centos
-os_version: "8.3"
-overrides:
-  selinux:
-    whitelist:
-      - scontext=system_u:system_r:logrotate_t:s0
-
-tasks:
-- cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:octopus
-    cephadm_branch: octopus
-    cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-    # deploy additional mons the "old" (octopus) way
-    add_mons_via_daemon_add: true
-    avoid_pacific_features: true
-
-
-roles:
-- - mon.a
-  - mon.c
-  - mgr.y
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-#  - ceph.rgw.realm.zone.a  # CLI change in v16 pacific
-  - node-exporter.a
-  - alertmanager.a
-- - mon.b
-  - mgr.x
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.1
-  - prometheus.a
-  - grafana.a
-  - node-exporter.b
-  - ceph.iscsi.iscsi.a

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
new file mode 100644 (file)
index 0000000..a1a9cb5
--- /dev/null
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
@@ -0,0 +1,43 @@
+os_type: centos
+os_version: "8.stream"
+
+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
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.0
+    cephadm_branch: v15.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+    # deploy additional mons the "old" (octopus) way
+    add_mons_via_daemon_add: true
+    avoid_pacific_features: true
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+#   - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
+#  - ceph.iscsi.iscsi.a  # needs later start point

diff --git a/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/0-distro/centos_8.stream_container_tools.yaml
new file mode 120000 (symlink)
index 0000000..7a86f96
--- /dev/null
+++ b/qa/suites/orch/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