From: Orit Wasserman Date: Mon, 4 Jan 2016 09:03:08 +0000 (+0100) Subject: tests: use ceph-jewel branch for s3tests X-Git-Tag: v10.2.6~158^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06e40eb27f65df861b8f9992f0706fbc464d3f39;p=ceph.git tests: use ceph-jewel branch for s3tests Signed-off-by: Nathan Cutler --- diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml index 8796747c6bae..91dddafb6216 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml @@ -4,5 +4,5 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-jewel 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 993f6ebaf7de..29ff9de252f4 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml @@ -8,5 +8,5 @@ tasks: valgrind: [--tool=memcheck] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-jewel 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 611a0ddcb3ad..7c9b0a22e0ae 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml @@ -58,6 +58,6 @@ tasks: metadata-only: true - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-jewel idle_timeout: 300 rgw_server: client.0