qa/tests: changed disto to centos and ubuntu latest and changed step to 18.2.2

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml
index 443b89fcff9172e556dfe52b68907fd80ffe2e10..4ead1d9dbf616e2d8d58a4877980369cbcfb23e3 100644 (file)
--- a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/point-to-point-upgrade.yaml
@@ -3,7 +3,7 @@ meta:
    Run ceph on two nodes, using one of them as a client,
    with a separate client-only node.
    Use xfs beneath the osds.
-   install ceph/reef v18.2.1 and the v18.2.x point versions
+   install ceph/reef v18.2.2 and the v18.2.x point versions
    run workload and upgrade-sequence in parallel
    (every point release should be tested)
    run workload and upgrade-sequence in parallel
@@ -85,17 +85,17 @@ tasks:
 - print: "**** done workload v18.2.0"
 
 
-#######  upgrade to v18.2.1
+#######  upgrade to v18.2.2
 - install.upgrade:
     #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
     mon.a:
-      tag: v18.2.1
+      tag: v18.2.2
     mon.b:
-      tag: v18.2.1
+      tag: v18.2.2
 - parallel:
    - workload_reef
    - upgrade-sequence_reef
-- print: "**** done parallel reef v18.2.1"
+- print: "**** done parallel reef v18.2.2"
 
 ####  upgrade to latest reef
 - install.upgrade:
@@ -118,7 +118,7 @@ workload_reef:
    full_sequential:
    - workunit:
        branch: reef
-       # tag: v18.2.1
+       # tag: v18.2.2
        clients:
          client.1:
          - rados/test.sh

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml
deleted file mode 120000 (symlink)
index bb4a6aa..0000000
--- a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/supported-all-distro/centos_8.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml
new file mode 120000 (symlink)
index 0000000..5de0bb5
--- /dev/null
+++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/centos_9.stream.yaml
@@ -0,0 +1 @@
+../../../../../distros/all/centos_9.stream.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml
deleted file mode 100644 (file)
index f2039823003f27bfe6a895a72d93445f22cc4c87..0000000000000000000000000000000000000000
--- a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6cea1cd34c1e64ad4649717482cbd909536fc09b
--- /dev/null
+++ b/qa/suites/upgrade/reef-p2p/reef-p2p-parallel/supported-all-distro/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/all/ubuntu_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml
deleted file mode 100644 (file)
index f2039823003f27bfe6a895a72d93445f22cc4c87..0000000000000000000000000000000000000000
--- a/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"

diff --git a/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml b/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6cea1cd34c1e64ad4649717482cbd909536fc09b
--- /dev/null
+++ b/qa/suites/upgrade/reef-p2p/reef-p2p-stress-split/supported-all-distro/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/all/ubuntu_latest.yaml
\ No newline at end of file