From: Sage Weil <sage@inktank.com>
Date: Mon, 6 May 2013 03:56:13 +0000 (-0700)
Subject: upgrade: fix up rgw tests a bit
X-Git-Tag: v0.94.10~27^2^2~730
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=496fd60eb9aede7e2801acb3c64d4d9105c72305;p=ceph.git

upgrade: fix up rgw tests a bit
---

diff --git a/suites/upgrade/rgw/a/start.yaml b/suites/upgrade/rgw/a/start.yaml
index a7073a1001b3..8b1ebbe2c361 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 98aea7adcf0f..8020d793c37f 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