From: Sage Weil <sage@redhat.com>
Date: Mon, 21 Mar 2016 11:23:51 +0000 (-0400)
Subject: upgrade/infernalis-x/point-to-point: do upgrade before test workload
X-Git-Tag: v10.2.6~165^2^2~142
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b6795a716e07e1c47c7f9aa0dc04903b7dd51aa;p=ceph.git

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

Test creates pools, that can fail while crushtool is being
overwritten.

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 615891d6c6b1..dd6514a77422 100644
--- 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
@@ -62,6 +62,13 @@ tasks:
 - install.upgrade:
    client.1:
      branch: infernalis
+- print: "**** done branch: -infernalis install.upgrade on client.1"
+- install.upgrade:
+   mon.a:
+     #branch: infernalis
+   mon.b:
+     #branch: infernalis
+- print: "**** done branch: -x install.upgrade on mon.a and mon.b"
 - parallel:
    - workload_x
    - upgrade-sequence_x
@@ -157,15 +164,6 @@ workload_x:
    - print: "**** done s3tests workload_x"
 upgrade-sequence_x:
    sequential:
-   - install.upgrade:
-       mon.a:
-         #branch: infernalis
-       mon.b:
-         #branch: infernalis
-       # Note that client.a IS NOT upgraded here 
-       #client.1:
-         #branch: infernalis
-   - print: "**** done branch: -x install.upgrade"
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60