Added "force-branch: firefly-original" to make sure we run on good s3tests branch

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/suites/upgrade/firefly/older/5-final/testrgw.yaml b/suites/upgrade/firefly/older/5-final/testrgw.yaml
index 0d36f60413113f32c40525ccffff3c2ce1923302..5d388e8620010b37b1a3fbc36f6a123d95c22147 100644 (file)
--- a/suites/upgrade/firefly/older/5-final/testrgw.yaml
+++ b/suites/upgrade/firefly/older/5-final/testrgw.yaml
@@ -3,4 +3,5 @@ tasks:
   - rgw: [client.1]
   - s3tests:
       client.1:
+         force-branch: firefly-original
          rgw_server: client.1

diff --git a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
index 0321cbbca9174f2b6084b68d240dbcc820d9724c..f483e4810b7338d1db721ad833642d94f9f888c8 100644 (file)
--- a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
+++ b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
@@ -277,4 +277,3 @@ upgrade-sequence_firefly:
    - sleep:
        duration: 60
    - print: "**** done ceph.restart all firefly current branch mds/osd/mon"
-