From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 21 Sep 2021 13:16:48 +0000 (-0700)
Subject: qa/tests: advanced version to reflect the latest 16.2.6 release
X-Git-Tag: v16.2.7~111^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a36d6abe3bdd7672fb34f8b96d28ea79b513e53;p=ceph.git

qa/tests: advanced version to reflect the latest 16.2.6 release

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

diff --git a/qa/suites/upgrade/pacific-p2p/pacific-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/pacific-p2p/pacific-p2p-parallel/point-to-point-upgrade.yaml
index 9a2d9d8c87a4..061f6ddc56ee 100644
--- a/qa/suites/upgrade/pacific-p2p/pacific-p2p-parallel/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/pacific-p2p/pacific-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/pacific v16.2.4 and the v16.2.x point versions
+   install ceph/pacific v16.2.5 and the v16.2.x point versions
    run workload and upgrade-sequence in parallel
    (every point release should be tested)
    run workload and upgrade-sequence in parallel
@@ -69,28 +69,28 @@ openstack:
     count: 3
     size: 30 # GB
 tasks:
-- print: "****  done pacific about to install v16.2.4 "
+- print: "****  done pacific about to install v16.2.5 "
 - install:
-    tag: v16.2.4
+    tag: v16.2.5
     # line below can be removed its from jewel test
     #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librgw2']
-- print: "**** done v16.2.4 install"
+- print: "**** done v16.2.5 install"
 - ceph:
    fs: xfs
    add_osds_to_crush: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload
-- print: "**** done workload v16.2.4"
+- print: "**** done workload v16.2.5"
 
 
-#######  upgrade to v16.2.5
+#######  upgrade to v16.2.6
 - install.upgrade:
     #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
     mon.a:
-      tag: v16.2.5
+      tag: v16.2.6
     mon.b:
-      tag: v16.2.5
+      tag: v16.2.6
 - parallel:
    - workload_pacific
    - upgrade-sequence_pacific
diff --git a/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific..yaml b/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific..yaml
deleted file mode 100644
index 537ed596ebc7..000000000000
--- a/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific..yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-meta:
-- desc: |
-   install ceph/pacific v16.2.4
-   Overall upgrade path is - pacific-latest.point => pacific-latest
-tasks:
-- install:
-    tag: v16.2.4
-    exclude_packages: ['librados3']
-    extra_packages: ['librados2']
-- print: "**** done install pacific v16.2.4"
-- ceph:
-- exec:
-    osd.0:
-      - ceph osd require-osd-release pacific
-      - ceph osd set-require-min-compat-client pacific
-- print: "**** done ceph"
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on osd down out interval zero: false
diff --git a/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific.yaml b/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific.yaml
new file mode 100644
index 000000000000..ff3c46897be1
--- /dev/null
+++ b/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/1-ceph-install/pacific.yaml
@@ -0,0 +1,21 @@
+meta:
+- desc: |
+   install ceph/pacific v16.2.6
+   Overall upgrade path is - pacific-latest.point => pacific-latest
+tasks:
+- install:
+    tag: v16.2.6
+    exclude_packages: ['librados3']
+    extra_packages: ['librados2']
+- print: "**** done install pacific v16.2.6"
+- ceph:
+- exec:
+    osd.0:
+      - ceph osd require-osd-release pacific
+      - ceph osd set-require-min-compat-client pacific
+- print: "**** done ceph"
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
diff --git a/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/6-final-workload/rbd-python.yaml b/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/6-final-workload/rbd-python.yaml
index 6436757c58e7..edf6d205c1ef 100644
--- a/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/6-final-workload/rbd-python.yaml
+++ b/qa/suites/upgrade/pacific-p2p/pacific-p2p-stress-split/6-final-workload/rbd-python.yaml
@@ -3,7 +3,7 @@ meta:
    librbd python api tests
 tasks:
 - workunit:
-    tag: v16.2.4
+    tag: v16.2.6
     clients:
       client.0:
         - rbd/test_librbd_python.sh