From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Feb 2017 20:24:50 +0000 (-0500)
Subject: qa/suites/upgrade/hammer-x: wrap thrash and workloads
X-Git-Tag: v10.2.6~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e75e23b9973c9c5203b3c3ed2cec35333b40d77;p=ceph.git

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 3cd3fc20233f..f9ee58928851 100644
--- 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 7c75c102fc4f..f8ff6474b5e3 100644
--- 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 1bcd1b8ccade..d75eb056ed8b 100644
--- 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 882d979c89ae..e29ccf9613ef 100644
--- 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 2fe02b3c7c7e..8ee559a054a0 100644
--- 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 9f8b7bb83e85..0136e9ed4b47 100644
--- 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 22e87c7ad21d..fbff55f28ffe 100644
--- 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 a940015b3746..8f8ddbea566d 100644
--- 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 19a24c2a7f5a..434465cd27a0 100644
--- 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: