Revert "Changed s3tests to run off "branch: giant-noreason" per Yehuda's fix for...

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml
index c7b6066c203c24e55bc365d142a7bfbd6de544d1..22c3a3f821a3c89fba6943cb021d68d7a1e92a5d 100644 (file)
--- a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml
@@ -1,6 +1,5 @@
 tasks:
 - rgw: [client.1]
 - s3tests:
-    branch: giant-noreason
     client.1:
       rgw_server: client.1

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_s3tests.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_s3tests.yaml
index 28f630bf93c216336fbbd2f6fc7d8638b81606c9..53ceb786ba0ef0e9440156b6d3d57cf1ad34f68c 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_s3tests.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_s3tests.yaml
@@ -1,7 +1,6 @@
 tasks:
   - rgw: [client.1]
   - s3tests:
-      branch: giant-noreason
       client.1:
         rgw_server: client.1
         branch: dumpling