From: Orit Wasserman Date: Mon, 4 Jan 2016 09:03:08 +0000 (+0100) Subject: use ceph-master branch for s3tests X-Git-Tag: v0.94.10~19^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c5ebf4adf26274802ec4cff229b2272dc4a4266;p=ceph.git use ceph-master branch for s3tests Signed-off-by: Orit Wasserman (cherry picked from commit 21160124028ab123b5c547499d911b0a1397214f) Conflicts: (trivial resolution) qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml qa/suites/rgw/verify/tasks/rgw_s3tests.yaml qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml --- diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml index 62608773a2ad..7db2d2552dfa 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml @@ -4,4 +4,5 @@ tasks: - rgw: [client.0] - s3tests: client.0: + force-branch: hammer rgw_server: client.0 diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml index c23a2cbf4eca..cb993554bb25 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml @@ -7,4 +7,5 @@ tasks: valgrind: [--tool=memcheck] - s3tests: client.0: + force-branch: hammer rgw_server: client.0 diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml index 399f4aac2f65..54abfed24b4a 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml @@ -56,4 +56,5 @@ tasks: - s3tests: client.0: idle_timeout: 300 + force-branch: hammer rgw_server: client.0