qa/suites/upgrade/kraken-x/parallel: fix

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

diff --git a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml
index 3b39878fba48b3909ca907e1bac5f37bb02c2305..eb5d185e5ccea5884f3e18fd49385d27be1a5db6 100644 (file)
--- a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml
@@ -6,6 +6,7 @@ meta:
    CephFS tests running on client 2,3
 roles:
 - - mon.a
+  - mgr.x
   - mds.a
   - osd.0
   - osd.1

diff --git a/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 7612ec531fd9f3b552633a51e9be92e352ca3f6d..cff3a68366d1b88766f01ea23373eeb788113a73 100644 (file)
--- a/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -4,7 +4,7 @@ meta:
 upgrade-sequence:
    sequential:
    - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c]
+       daemons: [mon.a, mon.b, mon.c, mgr.x]
    - ceph.restart:
        daemons: [osd.0, osd.1, osd.2, osd.3]
        wait-for-healthy: false

diff --git a/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 6db61d26f7499887060180c20acc9ce2f01b0957..f197de67945c441883fdf3d840b3460dc32c177c 100644 (file)
--- a/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -13,7 +13,7 @@ upgrade-sequence:
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [mon.b, mon.c]
+       daemons: [mon.b, mon.c, mgr.x]
        wait-for-healthy: true
    - sleep:
        duration: 60

diff --git a/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml b/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml
new file mode 120000 (symlink)
index 0000000..5c72153
--- /dev/null
+++ b/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml
@@ -0,0 +1 @@
+../../../../releases/luminous-with-mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml b/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml
deleted file mode 120000 (symlink)
index 5283ac7..0000000
--- a/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file