upgrade: fix mixed workloads

We are running cuttlefish/dumpling mix.  Client node still has cuttelfish.
Use cuttelfish workunits.

diff --git a/suites/upgrade/mixed-cluster/5-dumpling-workload/api.yaml b/suites/upgrade/mixed-cluster/5-dumpling-workload/api.yaml
deleted file mode 100644 (file)
index 573f563..0000000
--- a/suites/upgrade/mixed-cluster/5-dumpling-workload/api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls
-

diff --git a/suites/upgrade/mixed-cluster/5-dumpling-workload/load-gen-big.yaml b/suites/upgrade/mixed-cluster/5-dumpling-workload/load-gen-big.yaml
deleted file mode 100644 (file)
index 916cea7..0000000
--- a/suites/upgrade/mixed-cluster/5-dumpling-workload/load-gen-big.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - rados/load-gen-big.sh

diff --git a/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml b/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml
new file mode 100644 (file)
index 0000000..ad36bdd
--- /dev/null
+++ b/suites/upgrade/mixed-cluster/5-mixed-workload/api.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls
+

diff --git a/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml b/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml
new file mode 100644 (file)
index 0000000..0f6e616
--- /dev/null
+++ b/suites/upgrade/mixed-cluster/5-mixed-workload/load-gen-big.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/load-gen-big.sh