openstack/swift
Code Issues Proposed changes

Merge "Make our py2 func tests more explicitly py2"

Browse Source
This commit is contained in:
Zuul 2019-11-05 09:47:24 +00:00 committed by Gerrit Code Review
commit 23e1dba532
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.zuul.yaml
View File

@ -70,7 +70,7 @@
post-run: tools/playbooks/common/cover-post.yaml post-run: tools/playbooks/common/cover-post.yaml
- job: - job:
name: swift-tox-func name: swift-tox-func-py27
parent: swift-tox-base parent: swift-tox-base
description: | description: |
Run functional tests for swift under cPython version 2.7. Run functional tests for swift under cPython version 2.7.
@ -145,12 +145,12 @@
tox_envlist: func-s3api-py3 tox_envlist: func-s3api-py3
- job: - job:
name: swift-tox-func-centos-7 name: swift-tox-func-py27-centos-7
parent: swift-tox-func parent: swift-tox-func-py27
nodeset: centos-7 nodeset: centos-7
- job: - job:
name: swift-tox-func-encryption name: swift-tox-func-encryption-py27
parent: swift-tox-base parent: swift-tox-base
description: | description: |
Run functional tests for swift under cPython version 2.7. Run functional tests for swift under cPython version 2.7.
@ -162,12 +162,12 @@
tox_envlist: func-encryption tox_envlist: func-encryption
- job: - job:
name: swift-tox-func-encryption-centos-7 name: swift-tox-func-encryption-py27-centos-7
parent: swift-tox-func-encryption parent: swift-tox-func-encryption-py27
nodeset: centos-7 nodeset: centos-7
- job: - job:
name: swift-tox-func-ec name: swift-tox-func-ec-py27
parent: swift-tox-base parent: swift-tox-base
description: | description: |
Run functional tests for swift under cPython version 2.7. Run functional tests for swift under cPython version 2.7.
@ -179,12 +179,12 @@
tox_envlist: func-ec tox_envlist: func-ec
- job: - job:
name: swift-tox-func-ec-centos-7 name: swift-tox-func-ec-py27-centos-7
parent: swift-tox-func-ec parent: swift-tox-func-ec-py27
nodeset: centos-7 nodeset: centos-7
- job: - job:
name: swift-tox-func-domain-remap-staticweb name: swift-tox-func-domain-remap-staticweb-py27
parent: swift-tox-base parent: swift-tox-base
description: | description: |
Run functional tests for swift under cPython version 2.7. Run functional tests for swift under cPython version 2.7.
@ -196,7 +196,7 @@
tox_envlist: func-domain-remap-staticweb tox_envlist: func-domain-remap-staticweb
- job: - job:
name: swift-tox-func-s3api name: swift-tox-func-s3api-py27
parent: swift-tox-base parent: swift-tox-base
description: | description: |
Run functional tests for swift under cPython version 2.7. Run functional tests for swift under cPython version 2.7.
@ -494,27 +494,27 @@
- ^test/(functional|probe)/.*$ - ^test/(functional|probe)/.*$
# Functional tests # Functional tests
- swift-tox-func: - swift-tox-func-py27:
irrelevant-files: irrelevant-files:
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- swift-tox-func-encryption: - swift-tox-func-encryption-py27:
irrelevant-files: irrelevant-files:
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- swift-tox-func-domain-remap-staticweb: - swift-tox-func-domain-remap-staticweb-py27:
irrelevant-files: irrelevant-files:
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- swift-tox-func-ec: - swift-tox-func-ec-py27:
irrelevant-files: irrelevant-files:
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
- swift-tox-func-s3api: - swift-tox-func-s3api-py27:
irrelevant-files: irrelevant-files:
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
@ -618,11 +618,11 @@
- swift-tox-py27 - swift-tox-py27
- swift-tox-py36 - swift-tox-py36
- swift-tox-py37 - swift-tox-py37
- swift-tox-func - swift-tox-func-py27
- swift-tox-func-encryption - swift-tox-func-encryption-py27
- swift-tox-func-domain-remap-staticweb - swift-tox-func-domain-remap-staticweb-py27
- swift-tox-func-ec - swift-tox-func-ec-py27
- swift-tox-func-s3api - swift-tox-func-s3api-py27
- swift-tox-func-py37 - swift-tox-func-py37
- swift-tox-func-encryption - swift-tox-func-encryption
- swift-tox-func-domain-remap-staticweb-py37 - swift-tox-func-domain-remap-staticweb-py37
@ -677,9 +677,9 @@
experimental: experimental:
jobs: jobs:
- swift-tox-py27-centos-7 - swift-tox-py27-centos-7
- swift-tox-func-centos-7 - swift-tox-func-py27-centos-7
- swift-tox-func-encryption-centos-7 - swift-tox-func-encryption-py27-centos-7
- swift-tox-func-ec-centos-7 - swift-tox-func-ec-py27-centos-7
- swift-multinode-rolling-upgrade-queens - swift-multinode-rolling-upgrade-queens
- swift-multinode-rolling-upgrade-rocky - swift-multinode-rolling-upgrade-rocky
- swift-multinode-rolling-upgrade-stein - swift-multinode-rolling-upgrade-stein

12
tox.ini
View File

@ -40,10 +40,6 @@ commands =
basepython = python3 basepython = python3
commands = {[testenv:pep8]commands} commands = {[testenv:pep8]commands}
[testenv:func]
basepython = python2.7
commands = ./.functests {posargs}
[testenv:func-py3] [testenv:func-py3]
basepython = python3 basepython = python3
commands = ./.functests {posargs} commands = ./.functests {posargs}
@ -72,22 +68,30 @@ commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1 setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
[testenv:func]
basepython = python2.7
commands = ./.functests {posargs}
[testenv:func-encryption] [testenv:func-encryption]
basepython = python2.7
commands = ./.functests {posargs} commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1 setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
[testenv:func-domain-remap-staticweb] [testenv:func-domain-remap-staticweb]
basepython = python2.7
commands = ./.functests {posargs} commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1 setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
[testenv:func-ec] [testenv:func-ec]
basepython = python2.7
commands = ./.functests {posargs} commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1 setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
[testenv:func-s3api] [testenv:func-s3api]
basepython = python2.7
commands = ./.functests {posargs} commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1 setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api