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>

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
index 8c9163e98d05c6e058dcdc2bac87198f2e9fd3ef..021fcc68190455f8086e41111fb75b500842d343 100644 (file)
--- 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 8c9163e98d05c6e058dcdc2bac87198f2e9fd3ef..021fcc68190455f8086e41111fb75b500842d343 100644 (file)
--- 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 cbe2badfdbd1c363d7f64f4228ea77c83ac4b019..5c5a958804e3f5723aa122935238243e8d709868 100644 (file)
--- 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