upgrade/infernalis-x/point-to-point: upgrade before workload

Upgrading the mons can make pool creation fail.  Don't do it in
parallel with the rados api test workload (which does a lot of
that).

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml b/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
index 8e26f3f56aa1b80709c12b40fe37f76bee69e858..2203a41811d390ab54af30f731f10a22a34c4873 100644 (file)
--- a/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
+++ b/suites/upgrade/infernalis-x/point-to-point-x/point-to-point.yaml
@@ -47,6 +47,14 @@ tasks:
 - sequential:
    - workload
 - print: "**** done workload v9.2.0"
+- install.upgrade:
+    mon.a:
+      branch: infernalis
+    mon.b:
+      branch: infernalis
+    # Note that client.a IS NOT upgraded at this point
+    #client.1:
+      #branch: hammer
 - parallel:
    - workload_infernalis
    - upgrade-sequence_infernalis
@@ -92,14 +100,6 @@ workload_infernalis:
    - print: "**** done s3tests workload_infernalis"
 upgrade-sequence_infernalis:
    sequential:
-   - install.upgrade:
-       mon.a:
-         branch: infernalis
-       mon.b:
-         branch: infernalis
-       # Note that client.a IS NOT upgraded at this point
-       #client.1:
-         #branch: hammer
    - print: "**** done branch: infernalis install.upgrade"
    - ceph.restart: [mds.a]
    - sleep: