qa/rgw: point tentacle qa suites at ceph-tentacle test branches

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml
index 8710ce35893b1e378e1d48ed146891b91332f49c..a4093be173605835c4d7e677f677f81055b157b5 100644 (file)
--- a/qa/rgw/s3tests-branch.yaml
+++ b/qa/rgw/s3tests-branch.yaml
@@ -1,4 +1,4 @@
 overrides:
   s3tests:
-     force-branch: ceph-master
+     force-branch: ceph-tentacle
      # git_remote: https://github.com/ceph/

diff --git a/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml
index 1a6c0a74f2dbe4403495385ea7874c9169c4ce1a..c24f29343e45a27597a25cfd9642f04c7961438f 100644 (file)
--- a/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml
+++ b/qa/suites/rgw/cloud-transition/tasks/transition/cloud_transition_s3tests.yaml
@@ -53,7 +53,7 @@ tasks:
       lifecycle_tests: True
       cloudtier_tests: True
     #client.2:
-      #force-branch: ceph-master
+      #force-branch: ceph-tentacle
       #rgw_server: client.2
       #extra_attrs: ["cloud_transition"]
       #lc_debug_interval: 10

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index 184555660dc6a433263237372cca19c423ffcaa8..7145e7ee086f31203ce5cb9a6bc7046d9fc8a830 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -1,11 +1,11 @@
 tasks:
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-tentacle
       rgw_server: client.0
       stages: prepare
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-tentacle
       rgw_server: client.0
       stages: check

diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml
index 8fbd3cefb928d03ed3f354fdf15e55f44837e60a..b8a4665db1ff5ac806d9f6c25302ce3019d88e1a 100644 (file)
--- a/qa/suites/rgw/verify/tasks/ragweed.yaml
+++ b/qa/suites/rgw/verify/tasks/ragweed.yaml
@@ -1,6 +1,6 @@
 tasks:
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-tentacle
       rgw_server: client.0
       stages: prepare,check

diff --git a/qa/suites/rgw/verify/tasks/zzz-s3tests-java.yaml b/qa/suites/rgw/verify/tasks/zzz-s3tests-java.yaml
index 9ad89cc6790a7791233e9a2d8181e9f688092d65..530293305d10ee83107447c14182985e5c805fe0 100644 (file)
--- a/qa/suites/rgw/verify/tasks/zzz-s3tests-java.yaml
+++ b/qa/suites/rgw/verify/tasks/zzz-s3tests-java.yaml
@@ -1,6 +1,6 @@
 tasks:
 - s3tests-java:
     client.0:
-        force-branch: ceph-master
+        force-branch: ceph-tentacle
         force-repo: https://github.com/ceph/java_s3tests.git 
 

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..495161d78edd059900d2d9121133a8657dfa2d84 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,7 @@ tasks:
 - tox: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      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 65f7ec16b5145dc5fd2f1e714c8db93de61a4072..a7c2771d0263828325e325763e36722132e75ed3 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,7 @@ tasks:
 - tox: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      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 d76121fad1029c864b21329a4cb2e96e828e965a..74da6e5bce99bfd4b8d925034d058da064bcffb2 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
@@ -11,7 +11,7 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
+      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 8228501ca4b7b0036741156b29c682332e78d414..63d8c72d4574145dd66b79bdf1d6b02e520d0b81 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
@@ -12,7 +12,7 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
+      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 ee8e9d5b5dc3cefad21cb6b03da6d1b9d892c57b..79a604d9988c5b50f29cb9a0e84031b5c89f5ac1 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests.yaml
@@ -11,7 +11,7 @@ tasks:
 - s3tests:
     client.0:
       rgw_server: client.0
-      force-branch: ceph-master
+      force-branch: ceph-tentacle
 overrides:
   ceph:
     fs: xfs