From: Sage Weil <sage@inktank.com>
Date: Mon, 19 Aug 2013 21:30:09 +0000 (-0700)
Subject: upgrade/mixed-mons: run cuttlefish tests against (2 cuttlefish, 1 dumpling) mon cluster
X-Git-Tag: v0.94.10~27^2^2~591
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bcff44960cd41b621113a1cdb3f3898b963227e;p=ceph.git

upgrade/mixed-mons: run cuttlefish tests against (2 cuttlefish, 1 dumpling) mon cluster

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

diff --git a/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml
deleted file mode 100644
index b6f03ba10b70..000000000000
--- a/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - cephtool/test.sh
-        - mon/pool_ops.sh
diff --git a/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml
new file mode 100644
index 000000000000..8648784fd161
--- /dev/null
+++ b/suites/upgrade/mixed-mons/5-mixed-workload/cephtool.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      all:
+        - cephtool/test.sh
+        - mon/pool_ops.sh