Merging upstream version 18.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

17 files changed, 14 insertions, 19 deletions

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
deleted file mode 120000
index 7a86f967f..000000000
--- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_8.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml
new file mode 120000
index 000000000..dca92ddbf
--- /dev/null
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/0-centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/0-distro b/qa/suites/orch/cephadm/no-agent-workunits/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/no-agent-workunits/0-distro
+++ b/qa/suites/orch/cephadm/no-agent-workunits/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$
+++ b/qa/suites/orch/cephadm/orchestrator_cli/0-random-distro$
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/osds/0-distro b/qa/suites/orch/cephadm/osds/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/osds/0-distro
+++ b/qa/suites/orch/cephadm/osds/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-roleless/0-distro b/qa/suites/orch/cephadm/smoke-roleless/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/smoke-roleless/0-distro
+++ b/qa/suites/orch/cephadm/smoke-roleless/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$
+++ b/qa/suites/orch/cephadm/smoke-singlehost/0-random-distro$
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/.qa b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml
deleted file mode 120000
index 83fe02026..000000000
--- a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_8.stream_container_tools_crun.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml
new file mode 120000
index 000000000..5ef2595cf
--- /dev/null
+++ b/qa/suites/orch/cephadm/smoke-small/0-distro/centos_9.stream_runc.yaml
@@ -0,0 +1 @@
+.qa/distros/container-hosts/centos_9.stream_runc.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/smoke/0-distro b/qa/suites/orch/cephadm/smoke/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/smoke/0-distro
+++ b/qa/suites/orch/cephadm/smoke/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/thrash/0-distro b/qa/suites/orch/cephadm/thrash/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/thrash/0-distro
+++ b/qa/suites/orch/cephadm/thrash/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
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_9.stream.yaml
index bb9a220e6..6272eb0f1 100644
--- 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_9.stream.yaml
@@ -1,13 +1,7 @@
 os_type: centos
-os_version: "8.stream"
+os_version: "9.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: quay.io/ceph/ceph:v16.2.0
     cephadm_branch: v16.2.0
diff --git a/qa/suites/orch/cephadm/with-work/0-distro b/qa/suites/orch/cephadm/with-work/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/with-work/0-distro
+++ b/qa/suites/orch/cephadm/with-work/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/0-distro b/qa/suites/orch/cephadm/workunits/0-distro
index 4b341719d..661878557 120000
--- a/qa/suites/orch/cephadm/workunits/0-distro
+++ b/qa/suites/orch/cephadm/workunits/0-distro
@@ -1 +1 @@
-.qa/distros/container-hosts
\ No newline at end of file
+.qa/distros/supported-container-hosts
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
deleted file mode 120000
index 7a86f967f..000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml
new file mode 120000
index 000000000..dca92ddbf
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file