From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 14:06:05 +0000 (-0400)
Subject: upgrade/hammer-x: run rados.py to completion before moving on
X-Git-Tag: v10.2.6~165^2^2~367
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6fc7c6e1fdf65dc21e33ea87d24704d2826c7bb;p=ceph.git

upgrade/hammer-x: run rados.py to completion before moving on

Leave the final workloads alone.. those can run in parallel
with other stuff.

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

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
index cc62371e324..00e3c3d0de3 100644
--- a/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
+++ b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
@@ -1,4 +1,5 @@
 tasks:
+- full_sequential:
   - rados:
       clients: [client.0]
       ops: 4000
diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
index 922e61fdfc0..afbc3566c42 100644
--- a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
@@ -1,5 +1,6 @@
 tasks:
-- rados:
+- full_sequential:
+  - rados:
     clients: [client.0]
     ops: 4000
     objects: 500
diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
index 33c820d1277..311f4b1afc7 100644
--- a/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
@@ -1,5 +1,6 @@
 tasks:
-- rados:
+- full_sequential:
+  - rados:
     clients: [client.0]
     ops: 4000
     objects: 50
diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
index 3d87bb1c2c5..c6c7bd035ff 100644
--- a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
+++ b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
@@ -1,5 +1,6 @@
 tasks:
-- radosbench:
+- full_sequential:
+  - radosbench:
     clients: [client.0]
     time: 1800
 - print: "**** done radosbench 7-workload"