From 03dc6cb3b5cacfe2672ae03efcdc408dffb70c59 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 6 Jan 2021 08:52:54 -0800
Subject: [PATCH] qa/tests: octopus-x suite added more workloads

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---
 .../octopus-x/workload/ec-rados-default.yaml  | 25 +++++++++++++++++++
 .../octopus-x/workload/rados_loadgenbig.yaml  |  3 ++-
 .../octopus-x/workload/test_rbd_api.yaml      |  4 +--
 .../workload/test_rbd_python.disable          | 18 +++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml
 create mode 100644 qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable

diff --git a/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml b/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml
new file mode 100644
index 0000000000000..67a0f39c5da58
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml
@@ -0,0 +1,25 @@
+meta:
+- desc: |
+   run run randomized correctness test for rados operations
+   on an erasure-coded pool
+workload:
+  full_sequential:
+  - print: "**** done start ec-rados-default.yaml"
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done end ec-rados-default.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml b/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml
index 250ea74196880..6b93c83d70f69 100644
--- a/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml
+++ b/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml
@@ -3,9 +3,10 @@ meta:
    generate read/write load with rados objects ranging from 1MB to 25MB
 workload:
   full_sequential:
+    - print: "**** done start rados_loadgenbig.yaml"
     - workunit:
         branch: octopus
         clients:
           client.0:
             - rados/load-gen-big.sh
-    - print: "**** done rados/load-gen-big.sh workload"
+    - print: "**** done end rados_loadgenbig.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml
index 13646f0855e0c..c85d4783c9cab 100644
--- a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml
+++ b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml
@@ -3,10 +3,10 @@ meta:
    librbd C and C++ api tests
 workload:
   full_sequential:
-    - print: "**** done start rbd/test_librbd.sh"
+    - print: "**** done start test_rbd_api.yaml"
     - workunit:
         branch: octopus
         clients:
           client.0:
               - rbd/test_librbd.sh
-    - print: "**** done end rbd/test_librbd.sh"
+    - print: "**** done end test_rbd_api.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable b/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable
new file mode 100644
index 0000000000000..ac0b4cfcf47b4
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable
@@ -0,0 +1,18 @@
+
+
+##### This is disabled due to https://tracker.ceph.com/issues/48759
+
+
+meta:
+- desc: |
+   librbd python api tests
+workload:
+  full_sequential:
+    - print: "**** done start test_rbd_python.yaml"
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done end test_rbd_python.yaml"
+
-- 
2.39.5