upgrade/rgw*: use correct branch for s3tests

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

diff --git a/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
index 573cffbc30a1d123042c47a3e92bd951b41ee37f..6506960f73a36d51d504723c2600fdf2617b9572 100644 (file)
--- a/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
+++ b/suites/upgrade/rgw-double/5-dumpling-workload/s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
 - s3tests:
     client.0:
+      force-branch: dumpling
       rgw_server: client.0

diff --git a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
index 573cffbc30a1d123042c47a3e92bd951b41ee37f..c9978e655836556d41d1eca9372a4d70926dae6f 100644 (file)
--- a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
+++ b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
 - s3tests:
     client.0:
+      force-branch: next
       rgw_server: client.0

diff --git a/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
index 573cffbc30a1d123042c47a3e92bd951b41ee37f..6506960f73a36d51d504723c2600fdf2617b9572 100644 (file)
--- a/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
+++ b/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
 - s3tests:
     client.0:
+      force-branch: dumpling
       rgw_server: client.0