qa/rgw: point rgw test repos at ceph-squid release branch

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

diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml
index ef6819c87e06a4c1df50c8021ab245d27ca25225..6f19d61e4b08eb9bc0bed970863c535791277e5f 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-squid
     # git_remote: https://github.com/ceph/

diff --git a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
index 39023173fcefade397ee36995592d4f21b2b8dec..ce83c3e11e1eb2d4b4ffb8b4011e061501b83de4 100644 (file)
--- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
+++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
@@ -55,7 +55,7 @@ tasks:
       lifecycle_tests: True
       cloudtier_tests: True
     #client.2:
-      #force-branch: ceph-master
+      #force-branch: ceph-squid
       #rgw_server: client.2
       #storage classes: LUKEWARM, FROZEN
       #extra_attrs: ["cloud_transition"]

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index 66bdff817f5aad90ee2ca71e8c0d17589a1e704b..494a408e0bcda2a795d80418db782ad90ce51794 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -5,11 +5,11 @@ tasks:
 - tox: [client.0]
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-squid
       rgw_server: client.0
       stages: prepare
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-squid
       rgw_server: client.0
       stages: check

diff --git a/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml
index ef9110a956d45eeabb83c797778971218a378d3d..bc008e67ebe87277c1ec6ab5ec24ab61e431fbd7 100644 (file)
--- a/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml
+++ b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml
@@ -1,3 +1,3 @@
 overrides:
   ragweed:
-    default-branch: ceph-master # ceph-quincy doesn't have tox, but tests are the same
+    default-branch: ceph-squid # ceph-quincy doesn't have tox, but tests are the same

diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml
index 8fbd3cefb928d03ed3f354fdf15e55f44837e60a..48f6c42155164bf4712c43ed96ad07ce043db639 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-squid
       rgw_server: client.0
       stages: prepare,check

diff --git a/qa/suites/rgw/verify/tasks/s3tests-java.yaml b/qa/suites/rgw/verify/tasks/s3tests-java.yaml
index 9ad89cc6790a7791233e9a2d8181e9f688092d65..cbb1ab8b279b78d2a677cd6fb162b6119a8be9cf 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests-java.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests-java.yaml
@@ -1,6 +1,6 @@
 tasks:
 - s3tests-java:
     client.0:
-        force-branch: ceph-master
+        force-branch: ceph-squid
         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..ff1388fa690a2179aa113c6fff6dc66f4b129998 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-squid
       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..e0ad7810f42eb247bab85cf9b777b175a6a8ff93 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-squid
       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..8d4ebac003b82f0759a3bcf66607262663d7a721 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-squid
 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..53d3a9e8df1eb31ed046a1d83978d72f8ce30f6a 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-squid
 overrides:
   ceph:
     fs: xfs

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