upgrade/infernalis-x/parallel: do upgrade before workload

This avoids upgrades while pools are being created (which may run
crushtool and fail).

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

diff --git a/suites/upgrade/infernalis-x/parallel/1-infernalis-install/infernalis.yaml b/suites/upgrade/infernalis-x/parallel/1-infernalis-install/infernalis.yaml
index 4350645804753928af609b61fa53495b180f436f..aa02540e52f61f9ae0b80e33bb320bbe7f72f79e 100644 (file)
--- a/suites/upgrade/infernalis-x/parallel/1-infernalis-install/infernalis.yaml
+++ b/suites/upgrade/infernalis-x/parallel/1-infernalis-install/infernalis.yaml
@@ -9,6 +9,10 @@ tasks:
 - print: "**** done installing infernalis"
 - ceph:
 - 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/infernalis-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 13e4d98712df72e9b1de3590916e0362b7b95f57..2e41f7354c1de7dafdb56cd87d46cdbafb2a9a7e 100644 (file)
--- a/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -3,9 +3,5 @@ meta:
    upgrade the ceph cluster
 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/infernalis-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 0bbe6ca55c996baa16f322a0c3da8e721e1667fd..70d57dc4054c011b829e812ef94840c6b53383c8 100644 (file)
--- a/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/infernalis-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -7,9 +7,6 @@ meta:
    ceph expected to be healthy state after each step
 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
@@ -29,9 +26,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