From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 6 Sep 2019 19:08:29 +0000 (-0400)
Subject: qa/rgw: rgw/website suite uses subdomain calling format
X-Git-Tag: v15.1.0~1523^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30193%2Fhead;p=ceph.git

qa/rgw: rgw/website suite uses subdomain calling format

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

diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml
index b40a8f29716a..f6307214e745 100644
--- a/qa/suites/rgw/website/overrides.yaml
+++ b/qa/suites/rgw/website/overrides.yaml
@@ -23,3 +23,5 @@ overrides:
         valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
       client.1:
         valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214
+  s3tests:
+    calling-format: subdomain
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index f3201cbfa7a0..a3b4fb9af520 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -179,6 +179,7 @@ def configure(ctx, config):
     for client, properties in config['clients'].iteritems():
         properties = properties or {}
         s3tests_conf = config['s3tests_conf'][client]
+        s3tests_conf['DEFAULT']['calling_format'] = properties.get('calling-format', 'ordinary')
 
         # use rgw_server if given, or default to local client
         role = properties.get('rgw_server', client)
@@ -267,9 +268,8 @@ def run_tests(ctx, config):
     """
     assert isinstance(config, dict)
     testdir = teuthology.get_testdir(ctx)
-    # civetweb > 1.8 && beast parsers are strict on rfc2616
-    attrs = ["!fails_on_rgw", "!lifecycle_expiration", "!fails_strict_rfc2616"]
     for client, client_config in config.iteritems():
+        client_config = client_config or {}
         (remote,) = ctx.cluster.only(client).remotes.keys()
         args = [
             'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),
@@ -282,6 +282,10 @@ def run_tests(ctx, config):
             args += ['REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt']
         else:
             args += ['REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt']
+        # civetweb > 1.8 && beast parsers are strict on rfc2616
+        attrs = ["!fails_on_rgw", "!lifecycle_expiration", "!fails_strict_rfc2616"]
+        if client_config.get('calling-format') != 'ordinary':
+            attrs += ['!fails_with_subdomain']
         args += [
             '{tdir}/s3-tests/virtualenv/bin/nosetests'.format(tdir=testdir),
             '-w',
@@ -289,7 +293,7 @@ def run_tests(ctx, config):
             '-v',
             '-a', ','.join(attrs),
             ]
-        if client_config is not None and 'extra_args' in client_config:
+        if 'extra_args' in client_config:
             args.append(client_config['extra_args'])
 
         remote.run(