upgrade/hammer-x: set require_jewel_osds

And replace infernalis with jewel where relevant.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
index 13eaee15971f58614d3b6d601922b184a171e0d5..8c9a849d18e2fa40c1ae3d76219852a99df33f72 100644 (file)
--- a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
+++ b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
@@ -10,6 +10,9 @@ tasks:
 - exec:
     mon.a:
       - ceph osd down 0 1 2
-- ceph.restart: [osd.0, osd.1, osd.2]
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+    wait-for-osds-up: false
 - sleep:
     duration: 10

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml b/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
deleted file mode 120000 (symlink)
index 0465c11..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/infernalis.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/3-jewel.yaml b/suites/upgrade/hammer-x/f-h-x-offline/3-jewel.yaml
new file mode 120000 (symlink)
index 0000000..987c18c
--- /dev/null
+++ b/suites/upgrade/hammer-x/f-h-x-offline/3-jewel.yaml
@@ -0,0 +1 @@
+../../../../releases/jewel.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index fe36f914aa1f139e610a99a64bd52bf92b170526..468e9996e2d029632804596e1026a7770660bfb1 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -1,4 +1,12 @@
 upgrade-sequence:
    sequential:
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-   - print: "**** done ceph.restart all"
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - print: "**** done ceph.restart do not wait for healthy"
+   - exec:
+       mon.a:
+         - ceph osd set require_jewel_osds
+   - ceph.healthy:
+   - print: "**** done ceph.healthy"

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 8ad4e0a231203223d183392dc94f09fb3332183e..2907ea3f78d89e06baf7560353110b1338892220 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -26,6 +26,10 @@ upgrade-sequence:
        duration: 60
    - ceph.restart:
        daemons: [osd.2, osd.3]
-       wait-for-healthy: true
+       wait-for-healthy: false
+   - exec:
+       osd.0:
+         - ceph osd set require_jewel_osds
+   - ceph.healthy:
    - sleep:
        duration: 60

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

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

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml b/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
index 4377198b92a7b7275cedf7f5fa1cf79f1f7f4c99..f39039a9781bb4e757266a8696274f55a0c657fe 100644 (file)
--- a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
+++ b/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
@@ -21,11 +21,9 @@ tasks:
 - print: "*** Upgrade the target that runs osd.0 and osd.1 to -x while the target that runs osd.2 stays v0.94.3"
 - install.upgrade:
     osd.0:
-
 - print: "*** Restart the mon.a so that it is post-hammer v0.94.4 and implements the CEPH_FEATURE_HAMMER_0_94_4 feature"
 - ceph.restart:
     daemons: [mon.a]
-
 - print: "*** Verify that osd.0 cannot restart because osd.1 and osd.2 are still < v0.94.4"
 - ceph.restart:
     daemons: [osd.0]
@@ -100,3 +98,8 @@ tasks:
     osd.2:
 - ceph.restart:
     daemons: [osd.2]
+    wait-for-healthy: false
+- exec:
+    mon.a:
+      -  ceph osd set require_jewel_osds
+- ceph.healthy: