From: Sage Weil <sage@redhat.com>
Date: Mon, 21 Jul 2014 21:30:37 +0000 (-0700)
Subject: upgrade/dumpling-firefly-x: run firefly tests against firefly
X-Git-Tag: v0.94.10~27^2^2~380^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04d4476519e595128575e7f7d54cd5c26607e4e8;p=ceph.git

upgrade/dumpling-firefly-x: run firefly tests against firefly

At this point we've upgraded to firefly.

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml
index 119a70ff019a..203a510ca68a 100644
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml
@@ -1,7 +1,7 @@
 workload2:
   sequential:
   - workunit:
-      branch: dumpling
+      branch: firefly
       clients:
         client.0:
         - rados/test.sh
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml
index f82e070114f1..451130e2e382 100644
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml
@@ -1,7 +1,7 @@
 workload2:
   sequential:
   - workunit:
-      branch: dumpling
+      branch: firefly
       clients:
         client.0:
         - rados/load-gen-big.sh
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml
index 398bfee785b9..1cf824d99bf3 100644
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml
@@ -1,7 +1,7 @@
 workload2:
   sequential:
   - workunit:
-      branch: dumpling
+      branch: firefly
       clients:
         client.0:
         - rbd/test_librbd.sh
diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml
index 549b58232007..9409329b0a4f 100644
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml
@@ -1,7 +1,7 @@
 workload2:
   sequential:
   - workunit:
-      branch: dumpling
+      branch: firefly
       clients:
         client.0:
         - rbd/test_librbd_python.sh