From 496fd60eb9aede7e2801acb3c64d4d9105c72305 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Sun, 5 May 2013 20:56:13 -0700
Subject: [PATCH] upgrade: fix up rgw tests a bit

---
 suites/upgrade/rgw/a/start.yaml   | 1 +
 suites/upgrade/rgw/b/s3tests.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/suites/upgrade/rgw/a/start.yaml b/suites/upgrade/rgw/a/start.yaml
index a7073a1001b38..8b1ebbe2c3612 100644
--- 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 98aea7adcf0f3..8020d793c37fb 100644
--- 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
-- 
2.39.5