qa/rgw: tests run against ceph-quincy branch

target the ceph-quincy branch of s3tests, ragweed, and java_s3tests.
this commit targets the quincy branch specifically, rather than merging
to master and backporting

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

diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
index 791528508a0370916acf58e14ac3767fd89b6f86..6ee2b63081b6e384d3baa88d749ac55aab66f21f 100644 (file)
--- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml
+++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
@@ -1,7 +1,7 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       barbican:
         kms_key: my-key-1
         kms_key2: my-key-2

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index a6ecc649a13bdbdc68966bfb175d5a7f58bde14b..deef52c60cb840c9dbe74511c282ce13c1881ab1 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -4,12 +4,12 @@ tasks:
 - rgw: [client.0]
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-quincy
       rgw_server: client.0
       stages: prepare
 - ragweed:
     client.0:
-      default-branch: ceph-master
+      default-branch: ceph-quincy
       rgw_server: client.0
       stages: check
 overrides:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 4cdded04e768a166f187af236bfba07225bbf73b..41d79e8a1b1f0d6b7365e4effee1689d4cafb0ff 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -4,7 +4,7 @@ tasks:
 - rgw: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
index 61427f359a5eeee80fc1427f3ed7d141a9016582..a7cc0828b274d53d9527f177897c2b1ee4afc15b 100644 (file)
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -6,7 +6,7 @@ tasks:
 - s3tests:
     client.0:
       sts_tests: True
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0
       extra_attrs: ['webidentity_test']
 overrides:

diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml
index 10c2f2aed780a2d1ca1888866e9da74eadc05a04..2d8cc7a0e2ea8ae6859c2e2271fcb85f49991634 100644 (file)
--- a/qa/suites/rgw/sts/tasks/ststests.yaml
+++ b/qa/suites/rgw/sts/tasks/ststests.yaml
@@ -3,7 +3,7 @@ tasks:
     client.0:
       sts_tests: True
       extra_attrs: ["test_of_sts"]
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
index e691920f744a097c4224cc712ef17ab475640543..521775d2c4986e1359d7af829318094d4da03eab 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,7 +1,7 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml
index 8fbd3cefb928d03ed3f354fdf15e55f44837e60a..6d6f625a61180e1156918801216c59031a1d4472 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-quincy
       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..f90ff7ce1109792a457a79c9e300a0d7a08f0e49 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-quincy
         force-repo: https://github.com/ceph/java_s3tests.git 
 

diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml
index b5aef9b044b83cdb9b28cd40f31b989167d0d069..c585db43bc586ebb211de7e58dc85d9db17b0aca 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests.yaml
@@ -1,5 +1,5 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0

diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml
index 9ca6fcfbdb06a22eaf3e2e1b8922e99ffb110296..a02b8a081526b5024df3d0be9bd72479c1858515 100644 (file)
--- a/qa/suites/rgw/website/tasks/s3tests-website.yaml
+++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml
@@ -12,6 +12,6 @@ tasks:
       dns-s3website-name: s3-website.
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-quincy
       rgw_server: client.0
       rgw_website_server: client.1