upgrade: dumpling-next -> dumpling-x

Make the final upgrade step unspecified so that it can be specified at
schedule time.  This let us test dumpling -> firefly, dumpling->emperor, or
whatever else we want.

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

diff --git a/suites/upgrade/dumpling-next/parallel/% b/suites/upgrade/dumpling-next/parallel/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling-next/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-next/parallel/0-cluster/start.yaml
deleted file mode 100644 (file)
index 5b6d897..0000000
--- a/suites/upgrade/dumpling-next/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-  - client.1

diff --git a/suites/upgrade/dumpling-next/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-next/parallel/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index f1a0930..0000000
--- a/suites/upgrade/dumpling-next/parallel/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling-next/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-next/parallel/2-workload/rados_api.yaml
deleted file mode 100644 (file)
index e7f6719..0000000
--- a/suites/upgrade/dumpling-next/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-   sequential:
-     - workunit:
-       branch: dumpling
-       clients:
-          client.0:
-            - rados/test.sh
-            - cls
-

diff --git a/suites/upgrade/dumpling-next/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-next/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index 8fbf560..0000000
--- a/suites/upgrade/dumpling-next/parallel/2-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-   sequential:
-    -  workunit:
-       branch: dumpling
-       clients:
-          client.0:
-             - rados/load-gen-big.sh

diff --git a/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index d22b114..0000000
--- a/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-      branch: dumpling
-      clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index 076a1f4..0000000
--- a/suites/upgrade/dumpling-next/parallel/2-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-      branch: dumpling
-      clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 079638b..0000000
--- a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: next
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index e8dea79..0000000
--- a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: next
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index f9688c8..0000000
--- a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: next
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 91e607b..0000000
--- a/suites/upgrade/dumpling-next/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: next
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index bf85020..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.1]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index a0a4ada..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-   clients:
-     client.1:
-       - rados/load-gen-mix.sh

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index c4a3876..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.1:
-        - rados/test.sh

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index f19ef8f..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-        - cls/test_cls_rbd.sh
-

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 6bb704f..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.1:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_s3tests.yaml
deleted file mode 100644 (file)
index 22c3a3f..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.1]
-- s3tests:
-    client.1:
-      rgw_server: client.1

diff --git a/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index fb754ed..0000000
--- a/suites/upgrade/dumpling-next/parallel/4-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.1]
-- swift:
-    client.1:
-      rgw_server: client.1

diff --git a/suites/upgrade/dumpling-next/parallel/distros/centos_6.4.yaml b/suites/upgrade/dumpling-next/parallel/distros/centos_6.4.yaml
deleted file mode 120000 (symlink)
index 17ec6c8..0000000
--- a/suites/upgrade/dumpling-next/parallel/distros/centos_6.4.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/centos_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/parallel/distros/debian_7.0.yaml b/suites/upgrade/dumpling-next/parallel/distros/debian_7.0.yaml
deleted file mode 120000 (symlink)
index dc1be10..0000000
--- a/suites/upgrade/dumpling-next/parallel/distros/debian_7.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/debian_7.0.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/parallel/distros/fedora_19.yaml b/suites/upgrade/dumpling-next/parallel/distros/fedora_19.yaml
deleted file mode 120000 (symlink)
index 5ecc16b..0000000
--- a/suites/upgrade/dumpling-next/parallel/distros/fedora_19.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/fedora_19.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/parallel/distros/rhel_6.4.yaml b/suites/upgrade/dumpling-next/parallel/distros/rhel_6.4.yaml
deleted file mode 120000 (symlink)
index 5fe8801..0000000
--- a/suites/upgrade/dumpling-next/parallel/distros/rhel_6.4.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/rhel_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/parallel/distros/ubuntu_12.04.yaml b/suites/upgrade/dumpling-next/parallel/distros/ubuntu_12.04.yaml
deleted file mode 120000 (symlink)
index 1c4a08e..0000000
--- a/suites/upgrade/dumpling-next/parallel/distros/ubuntu_12.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/ubuntu_12.04.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/stress-split/% b/suites/upgrade/dumpling-next/stress-split/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling-next/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-next/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index 89d4b36..0000000
--- a/suites/upgrade/dumpling-next/stress-split/0-cluster/start.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-  - mon.c
-- - client.0

diff --git a/suites/upgrade/dumpling-next/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-next/stress-split/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index c98631e..0000000
--- a/suites/upgrade/dumpling-next/stress-split/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs

diff --git a/suites/upgrade/dumpling-next/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/dumpling-next/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 7c1e15e..0000000
--- a/suites/upgrade/dumpling-next/stress-split/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0: next
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]

diff --git a/suites/upgrade/dumpling-next/stress-split/3-thrash/default.yaml b/suites/upgrade/dumpling-next/stress-split/3-thrash/default.yaml
deleted file mode 100644 (file)
index 21d4c75..0000000
--- a/suites/upgrade/dumpling-next/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1

diff --git a/suites/upgrade/dumpling-next/stress-split/4-mon/mona.yaml b/suites/upgrade/dumpling-next/stress-split/4-mon/mona.yaml
deleted file mode 100644 (file)
index b6ffb33..0000000
--- a/suites/upgrade/dumpling-next/stress-split/4-mon/mona.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-next/stress-split/5-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-next/stress-split/5-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index 5797c2f..0000000
--- a/suites/upgrade/dumpling-next/stress-split/5-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 9d62a69..0000000
--- a/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index ae44a87..0000000
--- a/suites/upgrade/dumpling-next/stress-split/5-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/dumpling-next/stress-split/5-workload/readwrite.yaml b/suites/upgrade/dumpling-next/stress-split/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index c53e52b..0000000
--- a/suites/upgrade/dumpling-next/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10

diff --git a/suites/upgrade/dumpling-next/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/dumpling-next/stress-split/5-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/dumpling-next/stress-split/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/upgrade/dumpling-next/stress-split/6-next-mon/monb.yaml b/suites/upgrade/dumpling-next/stress-split/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index 513890c..0000000
--- a/suites/upgrade/dumpling-next/stress-split/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-next/stress-split/7-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-next/stress-split/7-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index 5797c2f..0000000
--- a/suites/upgrade/dumpling-next/stress-split/7-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/7-workload/radosbench.yaml b/suites/upgrade/dumpling-next/stress-split/7-workload/radosbench.yaml
deleted file mode 100644 (file)
index 3940870..0000000
--- a/suites/upgrade/dumpling-next/stress-split/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800

diff --git a/suites/upgrade/dumpling-next/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/dumpling-next/stress-split/7-workload/rbd_api.yaml
deleted file mode 100644 (file)
index bbcde3e..0000000
--- a/suites/upgrade/dumpling-next/stress-split/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: dumpling
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/8-next-mon/monc.yaml b/suites/upgrade/dumpling-next/stress-split/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index e1796d3..0000000
--- a/suites/upgrade/dumpling-next/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    mon.c: next
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- ceph.wait_for_mon_quorum: [a, b, c]

diff --git a/suites/upgrade/dumpling-next/stress-split/9-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-next/stress-split/9-workload/rados_api_tests.yaml
deleted file mode 100644 (file)
index cd11ae6..0000000
--- a/suites/upgrade/dumpling-next/stress-split/9-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/dumpling-next/stress-split/9-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 5c6df6e..0000000
--- a/suites/upgrade/dumpling-next/stress-split/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-next/stress-split/9-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-next/stress-split/9-workload/rgw-s3tests.yaml
deleted file mode 100644 (file)
index f835491..0000000
--- a/suites/upgrade/dumpling-next/stress-split/9-workload/rgw-s3tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0
-

diff --git a/suites/upgrade/dumpling-next/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/dumpling-next/stress-split/9-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 9e311c9..0000000
--- a/suites/upgrade/dumpling-next/stress-split/9-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/upgrade/dumpling-next/stress-split/distros/centos_6.4.yaml b/suites/upgrade/dumpling-next/stress-split/distros/centos_6.4.yaml
deleted file mode 120000 (symlink)
index 17ec6c8..0000000
--- a/suites/upgrade/dumpling-next/stress-split/distros/centos_6.4.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/centos_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/stress-split/distros/debian_7.0.yaml b/suites/upgrade/dumpling-next/stress-split/distros/debian_7.0.yaml
deleted file mode 120000 (symlink)
index dc1be10..0000000
--- a/suites/upgrade/dumpling-next/stress-split/distros/debian_7.0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/debian_7.0.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/stress-split/distros/fedora_19.yaml b/suites/upgrade/dumpling-next/stress-split/distros/fedora_19.yaml
deleted file mode 120000 (symlink)
index 5ecc16b..0000000
--- a/suites/upgrade/dumpling-next/stress-split/distros/fedora_19.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/fedora_19.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/stress-split/distros/rhel_6.4.yaml b/suites/upgrade/dumpling-next/stress-split/distros/rhel_6.4.yaml
deleted file mode 120000 (symlink)
index 5fe8801..0000000
--- a/suites/upgrade/dumpling-next/stress-split/distros/rhel_6.4.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/rhel_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-next/stress-split/distros/ubuntu_12.04.yaml b/suites/upgrade/dumpling-next/stress-split/distros/ubuntu_12.04.yaml
deleted file mode 120000 (symlink)
index 1c4a08e..0000000
--- a/suites/upgrade/dumpling-next/stress-split/distros/ubuntu_12.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../distros/ubuntu_12.04.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/parallel/% b/suites/upgrade/dumpling-x/parallel/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..5b6d897
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/0-cluster/start.yaml
@@ -0,0 +1,11 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+  - client.1

diff --git a/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml
new file mode 100644 (file)
index 0000000..f1a0930
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/1-dumpling-install/dumpling.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+   fs: xfs
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..e7f6719
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/2-workload/rados_api.yaml
@@ -0,0 +1,9 @@
+workload:
+   sequential:
+     - workunit:
+       branch: dumpling
+       clients:
+          client.0:
+            - rados/test.sh
+            - cls
+

diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..8fbf560
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -0,0 +1,7 @@
+workload:
+   sequential:
+    -  workunit:
+       branch: dumpling
+       clients:
+          client.0:
+             - rados/load-gen-big.sh

diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..d22b114
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_api.yaml
@@ -0,0 +1,7 @@
+workload:
+  sequential:
+    - workunit:
+      branch: dumpling
+      clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..076a1f4
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/2-workload/test_rbd_python.yaml
@@ -0,0 +1,7 @@
+workload:
+  sequential:
+    - workunit:
+      branch: dumpling
+      clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..9aebbf5
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -0,0 +1,4 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..df65c74
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,32 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..25eb6e4
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,32 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.3]

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e497800
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,34 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..bf85020
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.1]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..a0a4ada
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+   clients:
+     client.1:
+       - rados/load-gen-mix.sh

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..c4a3876
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,8 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- workunit:
+    clients:
+      client.1:
+        - rados/test.sh

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..f19ef8f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.1:
+        - cls/test_cls_rbd.sh
+

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..6bb704f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_import_export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.1:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..22c3a3f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- rgw: [client.1]
+- s3tests:
+    client.1:
+      rgw_server: client.1

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..fb754ed
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_swift.yaml
@@ -0,0 +1,5 @@
+tasks:
+- rgw: [client.1]
+- swift:
+    client.1:
+      rgw_server: client.1

diff --git a/suites/upgrade/dumpling-x/parallel/distros/centos_6.4.yaml b/suites/upgrade/dumpling-x/parallel/distros/centos_6.4.yaml
new file mode 120000 (symlink)
index 0000000..17ec6c8
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/distros/centos_6.4.yaml
@@ -0,0 +1 @@
+../../../../../distros/centos_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/parallel/distros/debian_7.0.yaml b/suites/upgrade/dumpling-x/parallel/distros/debian_7.0.yaml
new file mode 120000 (symlink)
index 0000000..dc1be10
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/distros/debian_7.0.yaml
@@ -0,0 +1 @@
+../../../../../distros/debian_7.0.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/parallel/distros/fedora_19.yaml b/suites/upgrade/dumpling-x/parallel/distros/fedora_19.yaml
new file mode 120000 (symlink)
index 0000000..5ecc16b
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/distros/fedora_19.yaml
@@ -0,0 +1 @@
+../../../../../distros/fedora_19.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/parallel/distros/rhel_6.4.yaml b/suites/upgrade/dumpling-x/parallel/distros/rhel_6.4.yaml
new file mode 120000 (symlink)
index 0000000..5fe8801
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/distros/rhel_6.4.yaml
@@ -0,0 +1 @@
+../../../../../distros/rhel_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/parallel/distros/ubuntu_12.04.yaml b/suites/upgrade/dumpling-x/parallel/distros/ubuntu_12.04.yaml
new file mode 120000 (symlink)
index 0000000..1c4a08e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/distros/ubuntu_12.04.yaml
@@ -0,0 +1 @@
+../../../../../distros/ubuntu_12.04.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/stress-split/% b/suites/upgrade/dumpling-x/stress-split/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..89d4b36
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/0-cluster/start.yaml
@@ -0,0 +1,12 @@
+roles:
+- - mon.a
+  - mon.b
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+  - mon.c
+- - client.0

diff --git a/suites/upgrade/dumpling-x/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-x/stress-split/1-dumpling-install/dumpling.yaml
new file mode 100644 (file)
index 0000000..c98631e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/1-dumpling-install/dumpling.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+    fs: xfs

diff --git a/suites/upgrade/dumpling-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/dumpling-x/stress-split/2-partial-upgrade/firsthalf.yaml
new file mode 100644 (file)
index 0000000..312df6e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install.upgrade:
+    osd.0: 
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]

diff --git a/suites/upgrade/dumpling-x/stress-split/3-thrash/default.yaml b/suites/upgrade/dumpling-x/stress-split/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..21d4c75
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/3-thrash/default.yaml
@@ -0,0 +1,11 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1

diff --git a/suites/upgrade/dumpling-x/stress-split/4-mon/mona.yaml b/suites/upgrade/dumpling-x/stress-split/4-mon/mona.yaml
new file mode 100644 (file)
index 0000000..b6ffb33
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/4-mon/mona.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..5797c2f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/5-workload/rados_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..9d62a69
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-cls.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..ae44a87
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/5-workload/rbd-import-export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..c53e52b
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/5-workload/readwrite.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10

diff --git a/suites/upgrade/dumpling-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/dumpling-x/stress-split/5-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/5-workload/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/dumpling-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/dumpling-x/stress-split/6-next-mon/monb.yaml
new file mode 100644 (file)
index 0000000..513890c
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/6-next-mon/monb.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.b]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-x/stress-split/7-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..5797c2f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/7-workload/rados_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..3940870
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/7-workload/radosbench.yaml
@@ -0,0 +1,4 @@
+tasks:
+- radosbench:
+    clients: [client.0]
+    time: 1800

diff --git a/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..bbcde3e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/7-workload/rbd_api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: dumpling
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml
new file mode 100644 (file)
index 0000000..73f22bd
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/8-next-mon/monc.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install.upgrade:
+    mon.c:
+- ceph.restart:
+    daemons: [mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.wait_for_mon_quorum: [a, b, c]

diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..cd11ae6
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/rados_api_tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..5c6df6e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/rbd-python.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml
new file mode 100644 (file)
index 0000000..f835491
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/rgw-s3tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- rgw: [client.0]
+- swift:
+    client.0:
+      rgw_server: client.0
+

diff --git a/suites/upgrade/dumpling-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/dumpling-x/stress-split/9-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..9e311c9
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/9-workload/snaps-many-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/dumpling-x/stress-split/distros/centos_6.4.yaml b/suites/upgrade/dumpling-x/stress-split/distros/centos_6.4.yaml
new file mode 120000 (symlink)
index 0000000..17ec6c8
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/distros/centos_6.4.yaml
@@ -0,0 +1 @@
+../../../../../distros/centos_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/stress-split/distros/debian_7.0.yaml b/suites/upgrade/dumpling-x/stress-split/distros/debian_7.0.yaml
new file mode 120000 (symlink)
index 0000000..dc1be10
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/distros/debian_7.0.yaml
@@ -0,0 +1 @@
+../../../../../distros/debian_7.0.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/stress-split/distros/fedora_19.yaml b/suites/upgrade/dumpling-x/stress-split/distros/fedora_19.yaml
new file mode 120000 (symlink)
index 0000000..5ecc16b
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/distros/fedora_19.yaml
@@ -0,0 +1 @@
+../../../../../distros/fedora_19.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/stress-split/distros/rhel_6.4.yaml b/suites/upgrade/dumpling-x/stress-split/distros/rhel_6.4.yaml
new file mode 120000 (symlink)
index 0000000..5fe8801
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/distros/rhel_6.4.yaml
@@ -0,0 +1 @@
+../../../../../distros/rhel_6.4.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-x/stress-split/distros/ubuntu_12.04.yaml b/suites/upgrade/dumpling-x/stress-split/distros/ubuntu_12.04.yaml
new file mode 120000 (symlink)
index 0000000..1c4a08e
--- /dev/null
+++ b/suites/upgrade/dumpling-x/stress-split/distros/ubuntu_12.04.yaml
@@ -0,0 +1 @@
+../../../../../distros/ubuntu_12.04.yaml
\ No newline at end of file