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 1de84f2de2e68703d85531a70e9c9df5490fbfe7..ee9b3b4f9232fbdaa09acf8f055e55f390771ba6 100644 (file)
--- 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 5d388e8620010b37b1a3fbc36f6a123d95c22147..0f03c4bbca802e8870caf4e860de2997ab5cfef2 100644 (file)
--- 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 b8b3387503dc0dc1bb605c638d4df030e343d44b..882b69350ef19a7baba19c52f33a8ee04699b0a4 100644 (file)
--- 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 a3ea6a601297a446508fc6cd88a6561870ec97ee..b13907798b9a1f1d0a5e2a64485cc94661252df9 100644 (file)
--- 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 3f0f30a608b4ef8b486873e8a9ac0529d77c3013..116811c12eab9d4784adc23762ba68c41573ef27 100644 (file)
--- 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: