use ceph-master branch for s3tests

Signed-off-by: Orit Wasserman <owasserm@redhat.com> (cherry picked from commit 2116012) 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
ceph · Jan 2, 2017 · ad54908 · ad54908
1 parent cc0e1cf
commit ad54908
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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: