rgw: add .yaml that configures s3tests branch for rgw suite

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml
new file mode 100644 (file)
index 0000000..ef6819c
--- /dev/null
+++ b/qa/rgw/s3tests-branch.yaml
@@ -0,0 +1,4 @@
+overrides:
+  s3tests:
+    force-branch: ceph-master
+    # git_remote: https://github.com/ceph/

diff --git a/qa/suites/rgw/cloud-transition/s3tests-branch.yaml b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

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 a263883c85ca573ef21a1b72c5634b25ae85af56..a001334cbbc604ddf8658381453f207504e08535 100644 (file)
--- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
+++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
@@ -47,7 +47,6 @@ tasks:
         #cloud_access_key: "87654321"
 - s3tests:
     client.0:
-      force-branch: ceph-master
       rgw_server: client.0
       storage classes: LUKEWARM, FROZEN
       extra_attrs: ["cloud_transition"]

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

diff --git a/qa/suites/rgw/crypt/s3tests-branch.yaml b/qa/suites/rgw/crypt/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/crypt/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/dbstore/s3tests-branch.yaml b/qa/suites/rgw/dbstore/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/dbstore/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
index 4c8764e4bab4b8ca26f3cddab341bf2305ac0f0d..f53bdca4941444ac12cf9def19e60b69d360ce13 100644 (file)
--- a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
@@ -9,7 +9,6 @@ tasks:
       - sudo chmod 0777 /var/lib/ceph/radosgw/dbstore-default_ns.db
 - s3tests:
     client.0:
-      force-branch: ceph-master
       dbstore_tests: True
       rgw_server: client.0
       extra_attrs: ["!fails_on_rgw,!fails_on_dbstore"]

diff --git a/qa/suites/rgw/lifecycle/s3tests-branch.yaml b/qa/suites/rgw/lifecycle/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/lifecycle/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
index ee9962d06b53ce2387c9cfe22824f44ef6209aa1..9bae70cdbe579a3355063415f8a4b2282b8ef460 100644 (file)
--- a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
@@ -4,7 +4,6 @@ tasks:
 - rgw: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
       rgw_server: client.0
       storage classes: LUKEWARM, FROZEN
       extra_attrs: ["lifecycle"]

diff --git a/qa/suites/rgw/multifs/s3tests-branch.yaml b/qa/suites/rgw/multifs/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/multifs/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

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

diff --git a/qa/suites/rgw/sts/s3tests-branch.yaml b/qa/suites/rgw/sts/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/sts/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
index 61427f359a5eeee80fc1427f3ed7d141a9016582..db785ba73febedd67c81748e53caed25106033b3 100644 (file)
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -6,7 +6,6 @@ tasks:
 - s3tests:
     client.0:
       sts_tests: True
-      force-branch: ceph-master
       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..175071b892f777e9cf5018564a23a32fd7c3a1b1 100644 (file)
--- a/qa/suites/rgw/sts/tasks/ststests.yaml
+++ b/qa/suites/rgw/sts/tasks/ststests.yaml
@@ -3,7 +3,6 @@ tasks:
     client.0:
       sts_tests: True
       extra_attrs: ["test_of_sts"]
-      force-branch: ceph-master
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/thrash/s3tests-branch.yaml b/qa/suites/rgw/thrash/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/thrash/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

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

diff --git a/qa/suites/rgw/verify/s3tests-branch.yaml b/qa/suites/rgw/verify/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/verify/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

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

diff --git a/qa/suites/rgw/website/s3tests-branch.yaml b/qa/suites/rgw/website/s3tests-branch.yaml
new file mode 120000 (symlink)
index 0000000..bdcaca4
--- /dev/null
+++ b/qa/suites/rgw/website/s3tests-branch.yaml
@@ -0,0 +1 @@
+.qa/rgw/s3tests-branch.yaml
\ No newline at end of file

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