From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 15 Jul 2015 21:19:44 +0000 (-0700)
Subject: Changed 'firefly-original' ref to 'firefly'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4659c24452b424df0a15feb5ba816fa9c5792fb7;p=ceph.git

Changed 'firefly-original' ref to 'firefly'
same as in https://github.com/ceph/ceph-qa-suite/pull/494

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/suites/upgrade/firefly/newer/2-workload/s3tests.yaml b/suites/upgrade/firefly/newer/2-workload/s3tests.yaml
index 1de84f2de2e6..ee9b3b4f9232 100644
--- a/suites/upgrade/firefly/newer/2-workload/s3tests.yaml
+++ b/suites/upgrade/firefly/newer/2-workload/s3tests.yaml
@@ -3,5 +3,5 @@ workload:
   - rgw: [client.0]
   - s3tests:
       client.0:
-        force-branch: firefly-original
+        force-branch: firefly
         rgw_server: client.0
diff --git a/suites/upgrade/firefly/older/5-final/testrgw.yaml b/suites/upgrade/firefly/older/5-final/testrgw.yaml
index 5d388e862001..0f03c4bbca80 100644
--- a/suites/upgrade/firefly/older/5-final/testrgw.yaml
+++ b/suites/upgrade/firefly/older/5-final/testrgw.yaml
@@ -3,5 +3,5 @@ tasks:
   - rgw: [client.1]
   - s3tests:
       client.1:
-         force-branch: firefly-original
+         force-branch: firefly
          rgw_server: client.1
diff --git a/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml b/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
index b8b3387503dc..882b69350ef1 100644
--- a/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
+++ b/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
@@ -64,6 +64,6 @@ tasks:
 - rgw: [client.0]
 - s3tests:
     client.0:
-      force-branch: firefly-original
+      force-branch: firefly
       rgw_server: client.0
 - print: "**** done s3tests"
diff --git a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
index a3ea6a601297..b13907798b9a 100644
--- a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
@@ -320,7 +320,7 @@ workload-x:
   - rgw: [client.0]
   - s3tests:
       client.0:
-        force-branch: firefly-original
+        force-branch: firefly
         rgw_server: client.0
 upgrade-sequence-x:
    sequential:
diff --git a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
index 3f0f30a608b4..116811c12eab 100644
--- a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
@@ -296,7 +296,7 @@ workload_firefly:
    - print: "**** done rgw workload_firefly"
    - s3tests:
        client.0:
-         force-branch: firefly-original
+         force-branch: firefly
          rgw_server: client.0
    - print: "**** done s3tests workload_firefly"
 upgrade-sequence_firefly: