upgrade/dumpling-x: upgrade final client node for final test

This means the final workloads are running firefly code.

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

diff --git a/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml b/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml
new file mode 100644 (file)
index 0000000..e5084db
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/4-final-upgrade/client.yaml
@@ -0,0 +1,3 @@
+tasks:
+  - install.upgrade:
+      client.0:

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
deleted file mode 100644 (file)
index 40f66da..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index faa96ed..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 88019be..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index 4ef4776..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 6c40377..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_s3tests.yaml
deleted file mode 100644 (file)
index c8b4e5f..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-x/parallel/4-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 445224c..0000000
--- a/suites/upgrade/dumpling-x/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-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..40f66da
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..faa96ed
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..88019be
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..4ef4776
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..6c40377
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..c8b4e5f
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-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/5-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..445224c
--- /dev/null
+++ b/suites/upgrade/dumpling-x/parallel/5-final-workload/rgw_swift.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - rgw: [client.1]
+  - swift:
+      client.1:
+        rgw_server: client.1