suites/upgrade/hammer-x: do upgrade before staritng working

Otherwise crushtool test will fail while creating pools.

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

diff --git a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
index 4b2c39d15deaf2fc522c3b8eaa741bbd3e2641a0..e5bf1fcacb67ab2ec6931116b707f59f2d636ccc 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
+++ b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
@@ -5,6 +5,10 @@ tasks:
 - ceph:
     fs: xfs
 - print: "**** done ceph"
+- install.upgrade:
+    mon.a:
+    mon.b:
+- print: "**** done install.upgrade mon.a and mon.b"
 - parallel:
     - workload
     - upgrade-sequence

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 3f74d7d14a3cc6cbc943e354801609d2df83d048..fe36f914aa1f139e610a99a64bd52bf92b170526 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -1,8 +1,4 @@
 upgrade-sequence:
    sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade mon.a and mon.b"
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
    - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index ec5d3f907a2b70f3d2d6eae21b36f24688bdbebd..8ad4e0a231203223d183392dc94f09fb3332183e 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -1,8 +1,5 @@
 upgrade-sequence:
    sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: true
@@ -22,9 +19,6 @@ upgrade-sequence:
       mon.b:
         - sudo ceph osd crush tunables hammer
    - print: "**** done ceph osd crush tunables hammer"
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
    - ceph.restart:
        daemons: [mon.b, mon.c]
        wait-for-healthy: true