qa/suites/upgrade/jewel-x/parallel: fix upgrade to luminous

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

diff --git a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 02cba21c2c85653e5902261ff9ccda1db3c4b1f7..6a0f82986b1b51a7af7efc155d24acbc67b806c3 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -4,12 +4,9 @@ meta:
 upgrade-sequence:
    sequential:
    - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       daemons: [mon.a, mon.b, mon.c]
+   - ceph.restart:
+       daemons: [mds.a, osd.0, osd.1, osd.2, osd.3]
        wait-for-healthy: false
        wait-for-osds-up: true
-   - exec:
-       mon.a:
-         - ceph osd set require_kraken_osds
-   - ceph.restart:
-       daemons: [osd.0]
    - print: "**** done ceph.restart all"

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

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