qa/rgw: add s3control subsuite

i would prefer to run the s3control test coverage in rgw/verify, but it
depends on rgw_dns_name configuration and support for wildcard dns which
breaks most of the other rgw/verify test cases

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

diff --git a/qa/suites/rgw/s3control/% b/qa/suites/rgw/s3control/%
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/rgw/s3control/0-install.yaml b/qa/suites/rgw/s3control/0-install.yaml
new file mode 100644 (file)
index 0000000..836c9b1
--- /dev/null
+++ b/qa/suites/rgw/s3control/0-install.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+- ceph:
+- dnsmasq:
+    client.0:
+      s3.: client.0
+- openssl_keys:
+- rgw:
+    client.0:
+      dns-name: s3.
+- tox: [client.0]

diff --git a/qa/suites/rgw/s3control/fixed-2.yaml b/qa/suites/rgw/s3control/fixed-2.yaml
new file mode 120000 (symlink)
index 0000000..230ff0f
--- /dev/null
+++ b/qa/suites/rgw/s3control/fixed-2.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-2.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/s3control/frontend b/qa/suites/rgw/s3control/frontend
new file mode 120000 (symlink)
index 0000000..926a53e
--- /dev/null
+++ b/qa/suites/rgw/s3control/frontend
@@ -0,0 +1 @@
+.qa/rgw_frontend
\ No newline at end of file

diff --git a/qa/suites/rgw/s3control/ignore-pg-availability.yaml b/qa/suites/rgw/s3control/ignore-pg-availability.yaml
new file mode 120000 (symlink)
index 0000000..32340b1
--- /dev/null
+++ b/qa/suites/rgw/s3control/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+.qa/rgw/ignore-pg-availability.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/s3control/overrides.yaml b/qa/suites/rgw/s3control/overrides.yaml
new file mode 100644 (file)
index 0000000..2710cf4
--- /dev/null
+++ b/qa/suites/rgw/s3control/overrides.yaml
@@ -0,0 +1,27 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
+      client:
+        setuser: ceph
+        setgroup: ceph
+        debug rgw: 20
+        debug rgw notification: 20
+        rgw crypt s3 kms backend: testing
+        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
+        rgw crypt require ssl: false
+        rgw torrent flag: true
+        rgw sts key: abcdefghijklmnop
+        rgw s3 auth use sts: true
+  rgw:
+    compression type: random
+    storage classes:
+      LUKEWARM:
+      FROZEN:
+  s3tests:
+    storage classes: LUKEWARM, FROZEN
+    accounts:
+      iam root: RGW88888888888888888
+      iam alt root: RGW99999999999999999

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

diff --git a/qa/suites/rgw/s3control/proto/http.yaml b/qa/suites/rgw/s3control/proto/http.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rgw/s3control/proto/https.yaml b/qa/suites/rgw/s3control/proto/https.yaml
new file mode 100644 (file)
index 0000000..e0742b5
--- /dev/null
+++ b/qa/suites/rgw/s3control/proto/https.yaml
@@ -0,0 +1,14 @@
+overrides:
+  openssl_keys:
+    root:
+      client: client.0
+      key-type: rsa:4096
+      cn: teuthology
+      install: [client.0]
+    rgw.client.0:
+      client: client.0
+      ca: root
+      embed-key: true
+  rgw:
+    client.0:
+      ssl certificate: rgw.client.0

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

diff --git a/qa/suites/rgw/s3control/supported-random-distro b/qa/suites/rgw/s3control/supported-random-distro
new file mode 120000 (symlink)
index 0000000..5e654c9
--- /dev/null
+++ b/qa/suites/rgw/s3control/supported-random-distro
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro/
\ No newline at end of file

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

diff --git a/qa/suites/rgw/s3control/tasks/s3tests.yaml b/qa/suites/rgw/s3control/tasks/s3tests.yaml
new file mode 100644 (file)
index 0000000..5926e0e
--- /dev/null
+++ b/qa/suites/rgw/s3control/tasks/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
+      s3control: True

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index c3a214d98d4ee9f7557e4a43d182e09881730bde..3a9db1d543ca8f06b7cf9284a7cccc3f110b4949 100644 (file)
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -488,6 +488,8 @@ def run_tests(ctx, config):
             attrs += ['not fails_with_subdomain']
         if not client_config.get('with-sse-s3'):
             attrs += ['not sse_s3']
+        if not client_config.get('s3control', False):
+            attrs += ["not s3control"]
 
         attrs += client_config.get('extra_attrs', [])
         if 'bucket_logging' not in attrs: