From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 11 Mar 2016 22:42:21 +0000 (-0800)
Subject: Added blogbench.yaml to parallel before and after -x upgrade steps
X-Git-Tag: v10.2.6~165^2^2~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c467a0fc7184f6bc7605e40ed60768fac3573627;p=ceph.git

Added blogbench.yaml to parallel before and after -x upgrade steps

Fixes #15093

Note: sequential and full_sequential (dictionary) can't be both under parallel stanza

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 1007011bef614bd92472cd2e445fa1ae4f676ce3)
---

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
index 8c9163e98d0..021fcc68190 100644
--- a/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
+++ b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
@@ -3,11 +3,12 @@ meta:
    run a cephfs stress test
    mount ceph-fuse on client.2 before running workunit
 workload:
-  sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 2-workload"
-  - workunit:
-      clients:
-         client.2:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 2-workload"
+  full_sequential:
+  - sequential:
+    - ceph-fuse:
+    - print: "**** done ceph-fuse 2-workload"
+    - workunit:
+        clients:
+           client.2:
+            - suites/blogbench.sh
+    - print: "**** done suites/blogbench.sh 2-workload"
diff --git a/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml
index 8c9163e98d0..021fcc68190 100644
--- a/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml
+++ b/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml
@@ -3,11 +3,12 @@ meta:
    run a cephfs stress test
    mount ceph-fuse on client.2 before running workunit
 workload:
-  sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 2-workload"
-  - workunit:
-      clients:
-         client.2:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 2-workload"
+  full_sequential:
+  - sequential:
+    - ceph-fuse:
+    - print: "**** done ceph-fuse 2-workload"
+    - workunit:
+        clients:
+           client.2:
+            - suites/blogbench.sh
+    - print: "**** done suites/blogbench.sh 2-workload"
diff --git a/suites/upgrade/infernalis-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/infernalis-x/parallel/2-workload/ec-rados-default.yaml
index cbe2badfdbd..5c5a958804e 100644
--- a/suites/upgrade/infernalis-x/parallel/2-workload/ec-rados-default.yaml
+++ b/suites/upgrade/infernalis-x/parallel/2-workload/ec-rados-default.yaml
@@ -2,8 +2,8 @@ meta:
 - desc: |
    run run randomized correctness test for rados operations
    on an erasure-coded pool
-tasks:
-- full_sequential:
+workload:
+  full_sequential:
   - rados:
       clients: [client.0]
       ops: 4000