From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 19 Jul 2019 15:43:37 +0000 (-0700)
Subject: qa/tests: added 14.2.2 to the mix
X-Git-Tag: v14.2.3~160^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48ede0000ce7ec129ee9f9df60844953a3a718f3;p=ceph.git

qa/tests: added 14.2.2 to the mix

Fixes: http://tracker.ceph.com/issues/40251
Fixes: http://tracker.ceph.com/issues/40832
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-parallel/point-to-point-upgrade.yaml
index 0c4953f79622..06f7f212b53d 100644
--- a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-parallel/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-parallel/point-to-point-upgrade.yaml
@@ -3,9 +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/nautilus v14.2.0 point version
-   run workload and upgrade-sequence in parallel
-   install ceph/nautilus v14.2.1? point version
+   install ceph/nautilus v14.2.2 point version
    run workload and upgrade-sequence in parallel
    (every point reslease should be tested)
    run workload and upgrade-sequence in parallel
@@ -34,7 +32,7 @@ overrides:
     - filesystem is degraded
     - OBJECT_MISPLACED
     ### ref: https://tracker.ceph.com/issues/40251 
-    - failed to encode map 
+    #removed see ^ - failed to encode map 
 
     fs: xfs
 
@@ -69,32 +67,24 @@ openstack:
     count: 3
     size: 30 # GB
 tasks:
-- print: "****  done nautilus v14.2.0 about to install"
+# v14.2.0 removed per http://tracker.ceph.com/issues/40251
+- print: "****  done nautilus v14.2.2 about to install"
 - install:
-    tag: v14.2.0
+    tag: v14.2.2
     # line below can be removed its from jewel test
     #exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librgw2']
-- print: "**** done v14.2.0 install"
+- print: "**** done v14.2.2 install"
 - ceph:
    fs: xfs
    add_osds_to_crush: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload
-- print: "**** done workload v14.2.0"
+- print: "**** done workload v14.2.2"
 
 
-# v14.2.1
-- install.upgrade:
-    mon.a:
-      tag: v14.2.1
-    mon.b:
-      tag: v14.2.1
-- print: "**** done v14.2.1 install"
-- parallel:
-   - workload_nautilus
-   - upgrade-sequence_nautilus
-- print: "**** done workload_nautilus v14.2.1"
+# v14.2.1 removed per http://tracker.ceph.com/issues/40251
+# v14.2.2
 
 #######  upgrade to v14.2.?? PLACEHOLDER
 #- install.upgrade:
@@ -128,7 +118,8 @@ workload:
 workload_nautilus:
    full_sequential:
    - workunit:
-       tag: v14.2.0
+       branch: nautilus
+       #tag: v14.2.0
        clients:
          client.1:
          - rados/test.sh
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/0-cluster/start.yaml
index 861bb37b99e7..5ebce3ced08a 100644
--- a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/0-cluster/start.yaml
@@ -11,7 +11,7 @@ overrides:
       - \(MON_DOWN\)
       - \(MGR_DOWN\)
       ### ref: https://tracker.ceph.com/issues/40251
-      - failed to encode map
+      #removed see ^ - failed to encode map
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/1-ceph-install/nautilus.yaml
index f6fef72a14be..75dc71fe9e43 100644
--- a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/1-ceph-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/1-ceph-install/nautilus.yaml
@@ -1,11 +1,11 @@
 meta:
-- desc: install ceph/nautilus v14.2.1
+- desc: install ceph/nautilus v14.2.2
 tasks:
 - install:
-    tag: v14.2.1
+    tag: v14.2.2
     exclude_packages: ['librados3']
     extra_packages: ['librados2']
-- print: "**** done install nautilus v14.2.0"
+- print: "**** done install nautilus v14.2.2"
 - ceph:
 - exec:
     osd.0: