qa/suites/upgrade/hammer-jewel-x: replace kraken.yaml with luminous.yaml

* add mgr.x to roles
* to setup mgr and set the require-osd-release bit in osdmap
* do not restart an osd for waiting for healthy: the cluster is not
  healthy until the require-osd-release=luminous is set in osdmap, and a
  mgr is up and running.

Fixes: http://tracker.ceph.com/issues/20342
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
index 9fa3ca31000a4eab99fdbf864b323649efc617a1..41f2afffb4ae5f993cd65f1e13ea59f8b174f705 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
@@ -11,6 +11,7 @@ roles:
 - - mon.a
   - osd.0
   - osd.1
+  - mgr.x
 - - mon.b
   - mon.c
   - osd.2

diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
index ddbb9ff4373e46e5db6d2cb67ed0b56dd58c2b0b..356f8adb52cd84fa113960d3d8f839d61854f11d 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
@@ -7,9 +7,4 @@ upgrade-sequence2:
        daemons: [mon.a, mon.b, mon.c, 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/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
index f59a152dc90b3ccab30411cf5e4236cb27fcd64b..4fdab3edd54257a7b654f18f12f79309ea937ee7 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
@@ -31,9 +31,5 @@ upgrade-sequence2:
        daemons: [osd.2, osd.3]
        wait-for-healthy: false
        wait-for-osds-up: true
-   - exec:
-       mon.a:
-         - ceph osd set require_kraken_osds
-   - ceph.restart: [osd.3]
    - sleep:
        duration: 60

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

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