From: Sage Weil <sage@newdream.net>
Date: Wed, 3 Mar 2021 14:23:56 +0000 (-0600)
Subject: qa/suites/upgrade: use kubic; test all distros
X-Git-Tag: v16.2.0~129^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1df0b305545a84e8a7dcb272d44cb723f693156e;p=ceph.git

qa/suites/upgrade: use kubic; test all distros

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

diff --git a/qa/suites/upgrade/octopus-x/parallel/0-distro b/qa/suites/upgrade/octopus-x/parallel/0-distro
new file mode 120000
index 000000000000..fb247fda1b33
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/0-distro
@@ -0,0 +1 @@
+../../../rados/cephadm/smoke/distro/
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/distro1$ b/qa/suites/upgrade/octopus-x/parallel/distro1$
deleted file mode 120000
index fb247fda1b33..000000000000
--- a/qa/suites/upgrade/octopus-x/parallel/distro1$
+++ /dev/null
@@ -1 +0,0 @@
-../../../rados/cephadm/smoke/distro/
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa b/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml
new file mode 120000
index 000000000000..3afeed74d509
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/stress-split/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/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml b/qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml
new file mode 120000
index 000000000000..3a09f9abb05c
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/stress-split/distro$/.qa b/qa/suites/upgrade/octopus-x/stress-split/distro$/.qa
deleted file mode 120000
index fea2489fdf6d..000000000000
--- a/qa/suites/upgrade/octopus-x/stress-split/distro$/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/stress-split/distro$/centos_latest.yaml b/qa/suites/upgrade/octopus-x/stress-split/distro$/centos_latest.yaml
deleted file mode 120000
index bd9854e70298..000000000000
--- a/qa/suites/upgrade/octopus-x/stress-split/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/upgrade/octopus-x/stress-split/distro$/ubuntu_latest.yaml b/qa/suites/upgrade/octopus-x/stress-split/distro$/ubuntu_latest.yaml
deleted file mode 120000
index 3a09f9abb05c..000000000000
--- a/qa/suites/upgrade/octopus-x/stress-split/distro$/ubuntu_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file