schedule_suite.sh: try to use same branch for s3-tests.git

If it isn't there, warn and fall back to master.

diff --git a/schedule_suite.sh b/schedule_suite.sh
index 70da58f738d2797263cdb36ff23d8ad0f3f4988d..48299e63eb6eb328f6cc25b618f42562ff02116e 100755 (executable)
--- a/schedule_suite.sh
+++ b/schedule_suite.sh
@@ -24,6 +24,12 @@ test ! -d ~/src/teuthology/virtualenv/bin && echo "error: expects to find ~/src/
 KERNEL_SHA1=`wget http://gitbuilder.ceph.com/kernel-deb-precise-x86_64-basic/ref/$kernel/sha1 -O- 2>/dev/null`
 CEPH_SHA1=`wget http://gitbuilder.ceph.com/ceph-tarball-precise-x86_64-$flavor/ref/$ceph/sha1 -O- 2>/dev/null`
 
+if wget http://github.com/ceph/s3-tests/tree/$ceph -O- 2>/dev/null ; then
+    s3branch=$ceph
+else
+    echo "branch $ceph not in s3-tests.git; will use master for s3tests"
+    s3branch='master'
+fi
 
 
 ## always include this
@@ -40,6 +46,8 @@ tasks:
 overrides:
   workunit:
     sha1: $CEPH_SHA1
+  s3tests:
+    branch: $s3branch
   ceph:
     sha1: $CEPH_SHA1
     log-whitelist: