From: Laura Flores <lflores@ibm.com>
Date: Fri, 14 Jun 2024 21:24:20 +0000 (-0500)
Subject: qa/suites/upgrade/reef-p2p/reef-p2p-parallel: increment upgrade to 18.2.2
X-Git-Tag: v18.2.5~566^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a9365afeb38afdb59530121ddae5c6fdfdfd2d1a;p=ceph.git

qa/suites/upgrade/reef-p2p/reef-p2p-parallel: increment upgrade to 18.2.2

Instead of installing 18.2.0, which still contains the osdmap crc bug tracked
in https://tracker.ceph.com/issues/63389, we should install v18.2.2 since this contains
the fix. Then, we upgrade to reef_latest. In this scenario, we do not expect to see the
crc bug. If we test any upgrade path before that, we will hit the warning and the test will fail.

Fixes: https://tracker.ceph.com/issues/66505
Signed-off-by: Laura Flores <lflores@ibm.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 443b89fcff917..eee713292623c 100644
--- 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 subsequent 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
@@ -70,32 +70,32 @@ openstack:
     count: 3
     size: 30 # GB
 tasks:
-- print: "****  done reef about to install v18.2.0 "
+- print: "****  done reef about to install v18.2.2 "
+  # See https://tracker.ceph.com/issues/66505. Versions < v18.2.2 contain the crc bug.
 - install:
-    tag: v18.2.0
+    tag: v18.2.2
     # line below can be removed its from jewel test
     #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librgw2']
-- print: "**** done v18.2.0 install"
+- print: "**** done v18.2.2 install"
 - ceph:
    fs: xfs
    add_osds_to_crush: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload
-- print: "**** done workload v18.2.0"
+- print: "**** done workload v18.2.2"
 
-
-#######  upgrade to v18.2.1
-- install.upgrade:
-    #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-    mon.a:
-      tag: v18.2.1
-    mon.b:
-      tag: v18.2.1
-- parallel:
-   - workload_reef
-   - upgrade-sequence_reef
-- print: "**** done parallel reef v18.2.1"
+# TODO: uncomment when v18.2.3 is available
+#######  upgrade to v18.2.3
+# - install.upgrade:
+#    mon.a:
+#      tag: v18.2.3
+#    mon.b:
+#      tag: v18.2.3
+#- parallel:
+#   - workload_reef
+#   - upgrade-sequence_reef
+#- print: "**** done parallel reef v18.2.3"
 
 ####  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