upgrade/hammer-jewel-x: misc fixes

diff --git a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
index 25cc17f0a338b73b09bca0662d4b87614d53bbce..77c781fc4777375494445bb39e3f21a7e0a19bad 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
@@ -4,6 +4,8 @@ overrides:
       mon:
         mon warn on legacy crush tunables: false
         mon debug unsafe allow tier with nonempty snaps: true
+    log-whitelist:
+      - wrongly marked me down
 roles:
 - - mon.a
   - osd.0

diff --git a/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml b/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
index 19d36b07d24ce7b83b817f3c421218496d7892fe..01dc9fa6dd489d74406a81dd8f60b45d34cde1b0 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
@@ -6,9 +6,11 @@ tasks:
 - ceph:
    fs: xfs
 - install.upgrade:
-    client.0:
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+    osd.0:
+      branch: jewel
+    osd.2:
       branch: jewel
-      exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "*** client.0 upgraded packages to jewel"
 - parallel:
    - workload

diff --git a/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml b/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml
new file mode 100644 (file)
index 0000000..60a3cb6
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install.upgrade:
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+    client.0:
+      branch: jewel

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
index 37a880b52b471861cbfeb039116be77bb3b40310..ab41db6d1728e00701ad660312e580af9d6c3b47 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
@@ -1,8 +1,14 @@
 tasks:
+   - install.upgrade:
+       exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+       client.0:
+         branch: jewel
+   - print: "**** done install.upgrade client.0 to jewel"
+   - install.upgrade:
+       osd.0:
+       osd.2:
+   - print: "**** done install.upgrade daemons to x"
    - parallel:
      - workload2
      - upgrade-sequence2
    - print: "**** done parallel workload2 and upgrade-sequence2"
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
index 5c5a958804e3f5723aa122935238243e8d709868..15168a18648718e622bd404df51a2128e4a61d9d 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
@@ -2,9 +2,14 @@ meta:
 - desc: |
    run run randomized correctness test for rados operations
    on an erasure-coded pool
-workload:
+workload2:
   full_sequential:
   - rados:
+      erasure_code_profile:
+        name: teuthologyprofile2
+        k: 2
+        m: 1
+        ruleset-failure-domain: osd
       clients: [client.0]
       ops: 4000
       objects: 50

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
index 348f1aed9419e8297f6955ff6e53632b0e91ec42..088976b3929ea9445adc15f388d0438911edb9c2 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
@@ -1,7 +1,7 @@
 meta:
 - desc: |
    object class functional tests
-workload:
+workload2:
   full_sequential:
     - workunit:
         branch: jewel

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
index a91ed2cfa85932088531886e0c6696b9fbd645a6..30f13077be3cda4094093dcdbb1846430559b542 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
@@ -1,7 +1,7 @@
 meta:
 - desc: |
    generate read/write load with rados objects ranging from 1MB to 25MB
-workload:
+workload2:
   full_sequential:
     - workunit:
         branch: jewel

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
index 15d892e200f1d326fd7d18b80f43d5221f3cd00c..e21839b04b1bd3727ec29f4c2a6a2c3aadf82838 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
@@ -1,7 +1,7 @@
 meta:
 - desc: |
    librbd C and C++ api tests
-workload:
+workload2:
   full_sequential:
     - workunit:
         branch: jewel

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
index bb2d3eac802913ff33271995c1f4e0d695c1e712..cae2c0600a6ffecb7a669678c264104ce2531bb2 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
@@ -1,7 +1,7 @@
 meta:
 - desc: |
    librbd python api tests
-workload:
+workload2:
   full_sequential:
     - workunit:
         branch: jewel

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
index 76d474d85948fb4809a8f548c3cc447cbc4b8025..ddbb9ff4373e46e5db6d2cb67ed0b56dd58c2b0b 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
@@ -1,7 +1,7 @@
 meta:
 - desc: |
    upgrade the ceph cluster
-upgrade-sequence:
+upgrade-sequence2:
    sequential:
    - ceph.restart:
        daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
index 42ba47ddab636131469059c3bf7f7b2c3a566b46..f59a152dc90b3ccab30411cf5e4236cb27fcd64b 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
@@ -5,7 +5,7 @@ meta:
    step one ordering: mon.a, osd.0, osd.1
    step two ordering: mon.b, mon.c, osd.2, osd.3
    ceph expected to be healthy state after each step
-upgrade-sequence:
+upgrade-sequence2:
    sequential:
    - ceph.restart:
        daemons: [mon.a]