From: Orit Wasserman Date: Mon, 4 Jan 2016 09:03:08 +0000 (+0100) Subject: tests: use ceph-kraken branch for s3tests X-Git-Tag: v11.2.1~131^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8946abf07cfa5c19dd3345c08cc6f1237b9f25c;p=ceph.git tests: use ceph-kraken 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 4cdded04e76..2a13795abf0 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml @@ -4,7 +4,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-kraken rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml index 7f5345db018..71be8ee5c9c 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests.yaml @@ -9,7 +9,7 @@ tasks: valgrind: [--tool=memcheck] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-kraken rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml b/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml index d86b0bbb21b..4f012d17018 100644 --- a/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml +++ b/qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml @@ -59,7 +59,7 @@ tasks: metadata-only: true - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-kraken idle_timeout: 300 rgw_server: client.0 overrides: