removed one upgrade-sequence step and re-named the rest of steps

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

diff --git a/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 9aebbf5..0000000
--- a/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-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-emperor-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index df65c74..0000000
--- a/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-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-emperor-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 25eb6e4..0000000
--- a/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-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-emperor-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index e497800..0000000
--- a/suites/upgrade/dumpling-emperor-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-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-emperor-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..e7f6719
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-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-emperor-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..8fbf560
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-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-emperor-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..d22b114
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-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-emperor-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-emperor-x/parallel/4-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..076a1f4
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/4-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-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..9aebbf5
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-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-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..df65c74
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-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-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..25eb6e4
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-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-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-emperor-x/parallel/5-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e497800
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/5-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-emperor-x/parallel/6-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..bf85020
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..a0a4ada
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..c4a3876
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..f19ef8f
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..6bb704f
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..22c3a3f
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-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-emperor-x/parallel/6-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..fb754ed
--- /dev/null
+++ b/suites/upgrade/dumpling-emperor-x/parallel/6-final-workload/rgw_swift.yaml
@@ -0,0 +1,5 @@
+tasks:
+- rgw: [client.1]
+- swift:
+    client.1:
+      rgw_server: client.1