Merge pull request #13222 from liewegas/wip-hammer-x-jewel

jewel: tests: qa/suites/upgrade/hammer-x/stress-split: finish thrashing before final upgrade
ceph · Feb 20, 2017 · a009942 · a009942
2 parents 40eedcc + 1e75e23
commit a009942
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
@@ -8,6 +8,9 @@ overrides:
     - detected stalls on CPUs
     - failed to encode map e
 tasks:
+- parallel:
+  - stress-tasks
+stress-tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml b/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - ceph.restart:
     daemons: [mon.a]
     wait-for-healthy: false

diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - workunit:
     branch: hammer
     clients:

diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - workunit:
     branch: hammer
     clients:

diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - full_sequential:
   - rados:
       clients: [client.0]

diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - full_sequential:
   - rados:
       clients: [client.0]

diff --git a/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml b/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - ceph.restart:
     daemons: [mon.b]
     wait-for-healthy: false

diff --git a/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - full_sequential:
   - radosbench:
       clients: [client.0]

diff --git a/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml b/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml
@@ -1,4 +1,4 @@
-tasks:
+stress-tasks:
 - workunit:
      branch: hammer
      clients: