Enable s3api and staticweb tests across all func tests

This patch removed the separate s3api, staticweb functional tests
gate jobs and added them across all other functional test jobs.

Change-Id: Ie1c606132a054defc2b3cc14a66031090e7b8449

4 files changed, 8 insertions, 100 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index e9c7d159a..081bcba46 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -140,30 +140,6 @@
       tox_envlist: func-ec-py3
 
 - job:
-    name: swift-tox-func-domain-remap-staticweb-py37
-    parent: swift-tox-func-py37
-    description: |
-      Run functional tests for swift under cPython version 3.7.
-
-      Uses tox with the ``func-domain-remap-staticweb-py3`` environment.
-      It sets TMPDIR to an XFS mount point created via
-      tools/test-setup.sh.
-    vars:
-      tox_envlist: func-domain-remap-staticweb-py3
-
-- job:
-    name: swift-tox-func-s3api-py37
-    parent: swift-tox-func-py37
-    description: |
-      Run functional tests for swift under cPython version 3.7.
-
-      Uses tox with the ``func-s3api`` environment.
-      It sets TMPDIR to an XFS mount point created via
-      tools/test-setup.sh.
-    vars:
-      tox_envlist: func-s3api-py3
-
-- job:
     name: swift-tox-func-py27-centos-7
     parent: swift-tox-func-py27
     nodeset: centos-7
@@ -203,30 +179,6 @@
     nodeset: centos-7
 
 - job:
-    name: swift-tox-func-domain-remap-staticweb-py27
-    parent: swift-tox-base
-    description: |
-      Run functional tests for swift under cPython version 2.7.
-
-      Uses tox with the ``func-domain-remap-staticweb`` environment.
-      It sets TMPDIR to an XFS mount point created via
-      tools/test-setup.sh.
-    vars:
-      tox_envlist: func-domain-remap-staticweb
-
-- job:
-    name: swift-tox-func-s3api-py27
-    parent: swift-tox-base
-    description: |
-      Run functional tests for swift under cPython version 2.7.
-
-      Uses tox with the ``func-s3api`` environment.
-      It sets TMPDIR to an XFS mount point created via
-      tools/test-setup.sh.
-    vars:
-      tox_envlist: func-s3api
-
-- job:
     name: swift-dsvm-functional
     parent: devstack-minimal
     description: |
@@ -526,21 +478,11 @@
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-tox-func-domain-remap-staticweb-py27:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
         - swift-tox-func-ec-py27:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-tox-func-s3api-py27:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
 
         # py3 functional tests
         - swift-tox-func-py37:
@@ -553,21 +495,11 @@
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-tox-func-domain-remap-staticweb-py37:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
         - swift-tox-func-ec-py37:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/probe/.*$
               - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
-        - swift-tox-func-s3api-py37:
-            irrelevant-files:
-              - ^(api-ref|doc|releasenotes)/.*$
-              - ^test/probe/.*$
-              - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
 
         # Other tests
         - swift-tox-func-s3api-ceph-s3tests-tempauth:
@@ -640,14 +572,10 @@
         - swift-tox-py38
         - swift-tox-func-py27
         - swift-tox-func-encryption-py27
-        - swift-tox-func-domain-remap-staticweb-py27
         - swift-tox-func-ec-py27
-        - swift-tox-func-s3api-py27
         - swift-tox-func-py37
         - swift-tox-func-encryption
-        - swift-tox-func-domain-remap-staticweb-py37
         - swift-tox-func-ec-py37
-        - swift-tox-func-s3api-py37
         - swift-probetests-centos-7:
             irrelevant-files:
               - ^(api-ref|releasenotes)/.*$
diff --git a/doc/saio/swift/proxy-server.conf b/doc/saio/swift/proxy-server.conf
index ca9431b24..8b64a6c09 100644
--- a/doc/saio/swift/proxy-server.conf
+++ b/doc/saio/swift/proxy-server.conf
@@ -80,6 +80,9 @@ use = egg:swift#copy
 [filter:listing_formats]
 use = egg:swift#listing_formats
 
+[filter:domain_remap]
+use = egg:swift#domain_remap
+
 [filter:symlink]
 use = egg:swift#symlink
 
diff --git a/test/functional/__init__.py b/test/functional/__init__.py
index 4edb721d3..aeafb1a41 100644
--- a/test/functional/__init__.py
+++ b/test/functional/__init__.py
@@ -479,8 +479,6 @@ def _load_s3api(proxy_conf_file, swift_conf_file, **kwargs):
 conf_loaders = {
     'encryption': _load_encryption,
     'ec': _load_ec_as_default_policy,
-    'domain_remap_staticweb': _load_domain_remap_staticweb,
-    's3api': _load_s3api,
 }
 
 
@@ -518,6 +516,11 @@ def in_process_setup(the_object_server=object_server):
     swift_conf = _in_process_setup_swift_conf(swift_conf_src, _testdir)
     _info('prepared swift.conf: %s' % swift_conf)
 
+    # load s3api and staticweb configs
+    proxy_conf, swift_conf = _load_s3api(proxy_conf, swift_conf)
+    proxy_conf, swift_conf = _load_domain_remap_staticweb(proxy_conf,
+                                                          swift_conf)
+
     # Call the associated method for the value of
     # 'SWIFT_TEST_IN_PROCESS_CONF_LOADER', if one exists
     conf_loader_label = os.environ.get(
diff --git a/tox.ini b/tox.ini
index 9d95fecb7..f73886f58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,24 +58,12 @@ commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
 
-[testenv:func-s3api-py3]
-basepython = python3
-commands = ./.functests {posargs}
-setenv = SWIFT_TEST_IN_PROCESS=1
-         SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api
-
 [testenv:func-encryption-py3]
 basepython = python3
 commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
 
-[testenv:func-domain-remap-staticweb-py3]
-basepython = python3
-commands = ./.functests {posargs}
-setenv = SWIFT_TEST_IN_PROCESS=1
-         SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
-
 [testenv:func]
 basepython = python2.7
 deps = {[testenv:py27]deps}
@@ -88,13 +76,6 @@ commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
 
-[testenv:func-domain-remap-staticweb]
-basepython = python2.7
-deps = {[testenv:py27]deps}
-commands = ./.functests {posargs}
-setenv = SWIFT_TEST_IN_PROCESS=1
-         SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
-
 [testenv:func-ec]
 basepython = python2.7
 deps = {[testenv:py27]deps}
@@ -102,13 +83,6 @@ commands = ./.functests {posargs}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
 
-[testenv:func-s3api]
-basepython = python2.7
-deps = {[testenv:py27]deps}
-commands = ./.functests {posargs}
-setenv = SWIFT_TEST_IN_PROCESS=1
-         SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api
-
 [testenv:venv]
 commands = {posargs}