qa/rgw: Remove 'force-branch' from s3tests configs

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
index 8f824838cb1068bc81b8c6a6b3ca2ce267eb81b2..3214fd9009bbd9678fa26975442660d4bbc41a1d 100644 (file)
--- a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
@@ -10,7 +10,6 @@ tasks:
 - tox: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
index 65f7ec16b5145dc5fd2f1e714c8db93de61a4072..e8c4296dc8659749b35ac6f42836f8a8f85f8f55 100644 (file)
--- a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
@@ -7,7 +7,6 @@ tasks:
 - tox: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
       unit_test_scan: True
       rgw_server: client.0
 overrides:

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
index d76121fad1029c864b21329a4cb2e96e828e965a..08ceb25c3574f0950459addcaf481c5d58900595 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
@@ -11,7 +11,6 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
 overrides:
   ceph:
     fs: xfs

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
index 8228501ca4b7b0036741156b29c682332e78d414..1746b5bbe735112112d58171dd2fd225f2576a60 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
@@ -12,7 +12,6 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
 overrides:
   ceph:
     fs: xfs

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests.yaml b/qa/suites/teuthology/rgw/tasks/s3tests.yaml
index ee8e9d5b5dc3cefad21cb6b03da6d1b9d892c57b..beaffbbde45ab43c6166ee5406ef65cbc38e7717 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests.yaml
@@ -11,7 +11,6 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
 overrides:
   ceph:
     fs: xfs