use ceph-master branch for s3tests

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(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 62608773a2ad672a45557213ee0db32c7c4e1ed8..7db2d2552dfad2ed46c00bf0873acfc79fd00d64 100644 (file)
--- 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 c23a2cbf4eca879a183c7cec7bad25f919828fd8..cb993554bb25f353c9d7ebd59fa4205e62a2d81a 100644 (file)
--- 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 399f4aac2f65f1e6882b1a28e1f9f8f8617302c8..54abfed24b4a506275ada3b0248e7f5aaf77457a 100644 (file)
--- 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