qa/suites/upgrade/jewel-x: fix upgrade order; fix split grouping

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

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-mon b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-mon
deleted file mode 120000 (symlink)
index 05f7c0d..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/4-mon/
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-workload/ec-rados-default.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-workload/ec-rados-default.yaml
new file mode 100644 (file)
index 0000000..eeffd92
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/4-workload/ec-rados-default.yaml
@@ -0,0 +1,22 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on an erasure coded pool
+tasks:
+  - 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 rados ec task"

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-finish-upgrade.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-finish-upgrade.yaml
new file mode 120000 (symlink)
index 0000000..a66a7dc
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-finish-upgrade.yaml
@@ -0,0 +1 @@
+../stress-split/5-finish-upgrade.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
deleted file mode 100644 (file)
index eeffd92..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on an erasure coded pool
-tasks:
-  - 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 rados ec task"

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-luminous.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-luminous.yaml
new file mode 120000 (symlink)
index 0000000..2b99d5c
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-luminous.yaml
@@ -0,0 +1 @@
+../stress-split/6-luminous.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-next-mon b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-next-mon
deleted file mode 120000 (symlink)
index c1c26d6..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/6-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/6-next-mon/
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 100644 (file)
index 0000000..ab439d5
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1,35 @@
+#
+# k=3 implies a stripe_width of 1376*3 = 4128 which is different from
+# the default value of 4096 It is also not a multiple of 1024*1024 and
+# creates situations where rounding rules during recovery becomes 
+# necessary. 
+#
+meta:
+- desc: |
+   randomized correctness test for rados operations on an erasure coded pool
+   using the jerasure plugin with k=3 and m=1
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    ec_pool: true
+    write_append_excl: false
+    erasure_code_profile:
+      name: jerasure31profile
+      plugin: jerasure
+      k: 3
+      m: 1
+      technique: reed_sol_van
+      ruleset-failure-domain: osd
+    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

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/8-next-mon b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/8-next-mon
deleted file mode 120000 (symlink)
index 6f626f9..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/8-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/8-next-mon/
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 100644 (file)
index ab439d5..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# k=3 implies a stripe_width of 1376*3 = 4128 which is different from
-# the default value of 4096 It is also not a multiple of 1024*1024 and
-# creates situations where rounding rules during recovery becomes 
-# necessary. 
-#
-meta:
-- desc: |
-   randomized correctness test for rados operations on an erasure coded pool
-   using the jerasure plugin with k=3 and m=1
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    ec_pool: true
-    write_append_excl: false
-    erasure_code_profile:
-      name: jerasure31profile
-      plugin: jerasure
-      k: 3
-      m: 1
-      technique: reed_sol_van
-      ruleset-failure-domain: osd
-    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

diff --git a/qa/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
index 40536ab404713263ca6b5d5ec7e4998166fa2b2c..9aef0e718a6d932e58f2a498120249652984b907 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
@@ -1,13 +1,10 @@
 meta:
 - desc: |
    Run ceph on two nodes,
-   with a separate client-only node. 
+   with a separate client-only node.
    Use xfs beneath the osds.
 overrides:
   ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
     fs: xfs
 roles:
 - - mon.a

diff --git a/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml
index ab5dcace9f72349a6217ee41395abe01e9a5246e..442dcf105a793c7e92983639c284c9eae5bd54fc 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -2,11 +2,11 @@ meta:
 - desc: |
    install upgrade ceph/-x on one node only
    1st half
-   restart : osd.0,1,2,3,4,5
+   restart : osd.0,1,2
 tasks:
 - install.upgrade:
-    osd.0: 
+    osd.0:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
+    daemons: [mon.a,mon.b,mon.c,osd.0, osd.1, osd.2]
 - print: "**** done ceph.restart 1st half"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml
index a600a166a8646023efff88d48571ca0d03b67005..398803296872e0c865af510f3556e4b16d9ed12c 100644 (file)
--- a/qa/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml
+++ b/qa/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml
@@ -9,6 +9,9 @@ overrides:
     - objects unfound and apparently lost
     - log bound mismatch
 tasks:
+- parallel:
+  - stress-tasks
+stress-tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-mon/mona.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-mon/mona.yaml
deleted file mode 100644 (file)
index e3c369d..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/4-mon/mona.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   restart mon.a so it is upgraded to -x
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.a"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/+ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/radosbench.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..626ae8e
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/radosbench.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   run randomized correctness test for rados operations
+   generate write load with rados bench
+stress-tasks:
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+- print: "**** done radosbench 7-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..7f4b06b
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-cls.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   run basic cls tests for rbd
+stress-tasks:
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+        - cls/test_cls_rbd.sh
+- print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..b8b6ad3
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd-import-export.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+stress-tasks:
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..a5ae1e5
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/rbd_api.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+stress-tasks:
+- workunit:
+     branch: kraken
+     clients:
+        client.0:
+           - rbd/test_librbd.sh
+- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/readwrite.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..41e34d6
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/readwrite.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool,
+   using only reads, writes, and deletes
+stress-tasks:
+- full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 500
+      write_append_excl: false
+      op_weights:
+        read: 45
+        write: 45
+        delete: 10
+- print: "**** done rados/readwrite 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/jewel-x/stress-split/4-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..f56d0de
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/4-workload/snaps-few-objects.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+stress-tasks:
+- full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+- print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml
new file mode 100644 (file)
index 0000000..9693b68
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install.upgrade:
+    osd.3:
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-workload/+ b/qa/suites/upgrade/jewel-x/stress-split/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-cls.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 84827e4..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   run basic cls tests for rbd
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-import-export.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index dd3d25f..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/5-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-workload/readwrite.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index 1b161b4..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool, 
-   using only reads, writes, and deletes
-tasks:
-- full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 500
-      write_append_excl: false
-      op_weights:
-        read: 45
-        write: 45
-        delete: 10
-- print: "**** done rados/readwrite 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-workload/snaps-few-objects.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index 71445bd..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-tasks:
-- full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-- print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/6-luminous.yaml b/qa/suites/upgrade/jewel-x/stress-split/6-luminous.yaml
new file mode 120000 (symlink)
index 0000000..5283ac7
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/6-luminous.yaml
@@ -0,0 +1 @@
+../../../../releases/luminous.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/stress-split/6-next-mon/monb.yaml b/qa/suites/upgrade/jewel-x/stress-split/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index ba71c73..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   restart mon.b so it is upgraded to -x
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.b 6-next-mon"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/+ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..24c2644
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rbd-python.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd python api tests
+tasks:
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..a3bf03b
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   swift api tests for rgw
+tasks:
+- rgw:
+    client.0:
+    default_idle_timeout: 300
+- print: "**** done rgw 9-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 9-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/snaps-many-objects.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    write_append_excl: false
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-workload/+ b/qa/suites/upgrade/jewel-x/stress-split/7-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-workload/radosbench.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-workload/radosbench.yaml
deleted file mode 100644 (file)
index 7d2be5f..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-   generate write load with rados bench
-tasks:
-- full_sequential:
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-- print: "**** done radosbench 7-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-workload/rbd_api.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 81067e6..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-tasks:
-- workunit:
-     branch: jewel
-     clients:
-        client.0:
-           - rbd/test_librbd.sh
-- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/8-next-mon/monc.yaml b/qa/suites/upgrade/jewel-x/stress-split/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index 12788b7..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   restart mon.c so it is upgraded to -x
-   as all mon were upgrated, expected ceph cluster reach quorum
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c 8-next-mon"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- print: "**** done wait_for_mon_quorum 8-next-mon"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/9-workload/+ b/qa/suites/upgrade/jewel-x/stress-split/9-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/jewel-x/stress-split/9-workload/rbd-python.yaml b/qa/suites/upgrade/jewel-x/stress-split/9-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 8da3457..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/9-workload/rgw-swift.yaml b/qa/suites/upgrade/jewel-x/stress-split/9-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index ba004ce..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/9-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-tasks:
-- rgw: 
-    client.0:
-    default_idle_timeout: 300
-- print: "**** done rgw 9-workload"
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done swift 9-workload"

diff --git a/qa/suites/upgrade/jewel-x/stress-split/9-workload/snaps-many-objects.yaml b/qa/suites/upgrade/jewel-x/stress-split/9-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/upgrade/jewel-x/stress-split/9-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    write_append_excl: false
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50