upgrade: fix up rgw tests a bit

diff --git a/suites/upgrade/rgw/a/start.yaml b/suites/upgrade/rgw/a/start.yaml
index a7073a1001b3884b2d27cf7eda2c9c2276a1009a..8b1ebbe2c36126bb6b0fc2ac55ec42d30d584e17 100644 (file)
--- a/suites/upgrade/rgw/a/start.yaml
+++ b/suites/upgrade/rgw/a/start.yaml
@@ -16,4 +16,5 @@ tasks:
     conf:
       client:
         client mount timeout: 600
+        rgw init timeout: 600
 - rgw: [client.0]

diff --git a/suites/upgrade/rgw/b/s3tests.yaml b/suites/upgrade/rgw/b/s3tests.yaml
index 98aea7adcf0f3f151ae7778ee1f5ea0e03722b10..8020d793c37fbd9028e09721db5939da99267cee 100644 (file)
--- a/suites/upgrade/rgw/b/s3tests.yaml
+++ b/suites/upgrade/rgw/b/s3tests.yaml
@@ -1,5 +1,5 @@
 tasks:
 - s3tests:
-    branch: bobtail
     client.0:
       rgw_server: client.0
+      force-branch: bobtail