qa/suites/upgrade/hammer-x: wrap thrash and workloads

We need the thrashing to stop before we do the final upgrade step.

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

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
index 3cd3fc20233fa080039cb38916c9eb60ae360309..f9ee589288511b1cba35b13ff84505ed695316f7 100644 (file)
--- 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
index 7c75c102fc4fce95f246fa45d29493d7a8744a31..f8ff6474b5e38421e20d9950179650a392e8bc62 100644 (file)
--- 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
index 1bcd1b8ccade1bae355928f31c3a3fc35274e7a0..d75eb056ed8bbfcc8e0525406e19e272de18cd2c 100644 (file)
--- 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
index 882d979c89ae154e91edcf8cbcfd7cbc7e39eb65..e29ccf9613efc138d706a3f0bc540ec8a682a42f 100644 (file)
--- 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
index 2fe02b3c7c7e3498ed9d8c94fc8824a942c55b6e..8ee559a054a01928cfffb39d25cc1675405ad4f8 100644 (file)
--- 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
index 9f8b7bb83e8527d403e0c65f66d24ff89cfb4a50..0136e9ed4b47d5d12548be942284b4df5271100c 100644 (file)
--- 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
index 22e87c7ad21d1e7afb562fff8d22713ee80c6e00..fbff55f28ffe777c36fea54852340b90aa716f38 100644 (file)
--- 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
index a940015b37460031fc7c1753043a10af257d17a4..8f8ddbea566d3cf81d5e72074cb963cca11fa359 100644 (file)
--- 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
index 19a24c2a7f5a41da56158d06529c227e9002a651..434465cd27a086be2bbd3cf981775f6595fec255 100644 (file)
--- 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: