From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Apr 2017 15:13:50 +0000 (-0400)
Subject: qa/suites/upgrade/kraken-x/parallel: fix
X-Git-Tag: v12.0.3~157^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=79f95bc65fd25af452a67a766aab1185ca87c003;p=ceph-ci.git

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 3b39878fba4..eb5d185e5cc 100644
--- 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 7612ec531fd..cff3a68366d 100644
--- 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 6db61d26f74..f197de67945 100644
--- 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
index 00000000000..5c72153e1f4
--- /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
index 5283ac73e1b..00000000000
--- a/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file