tentacle: 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 495161d78edd059900d2d9121133a8657dfa2d84..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-tentacle
       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 a7c2771d0263828325e325763e36722132e75ed3..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-tentacle
       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 74da6e5bce99bfd4b8d925034d058da064bcffb2..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-tentacle
 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 63d8c72d4574145dd66b79bdf1d6b02e520d0b81..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-tentacle
 overrides:
   ceph:
     fs: xfs

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests.yaml b/qa/suites/teuthology/rgw/tasks/s3tests.yaml
index 79a604d9988c5b50f29cb9a0e84031b5c89f5ac1..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-tentacle
 overrides:
   ceph:
     fs: xfs