Fix stable gate

This is a combination of 2 commits.

==========

Make our py2 func tests more explicitly py2

...because otherwise, I think they might be running under py3 right now.

(cherry picked from commit c512574e11)

----------

pin lower-constraints to run against python 2.7

(cherry picked from commit 281ffab2a5)

==========

Change-Id: I4e7e71cbaeda9e6bfcf4e415dd5f859df4835376
(cherry picked from commit 56ae0c7deb)
This commit is contained in:
Tim Burke 2019-11-05 01:45:26 +00:00
parent da83e066aa
commit 52fa1a65a6
2 changed files with 29 additions and 24 deletions

View File

@ -42,7 +42,7 @@
bindep_profile: test py35
- job:
name: swift-tox-func
name: swift-tox-func-py27
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
@ -54,12 +54,12 @@
tox_envlist: func
- job:
name: swift-tox-func-centos-7
parent: swift-tox-func
name: swift-tox-func-py27-centos-7
parent: swift-tox-func-py27
nodeset: centos-7
- job:
name: swift-tox-func-encryption
name: swift-tox-func-encryption-py27
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
@ -71,12 +71,12 @@
tox_envlist: func-encryption
- job:
name: swift-tox-func-encryption-centos-7
parent: swift-tox-func-encryption
name: swift-tox-func-encryption-py27-centos-7
parent: swift-tox-func-encryption-py27
nodeset: centos-7
- job:
name: swift-tox-func-ec
name: swift-tox-func-ec-py27
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
@ -89,12 +89,12 @@
tox_envlist: func-ec
- job:
name: swift-tox-func-ec-centos-7
parent: swift-tox-func-ec
name: swift-tox-func-ec-py27-centos-7
parent: swift-tox-func-ec-py27
nodeset: centos-7
- job:
name: swift-tox-func-domain-remap-staticweb
name: swift-tox-func-domain-remap-staticweb-py27
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
@ -106,7 +106,7 @@
tox_envlist: func-domain-remap-staticweb
- job:
name: swift-tox-func-s3api
name: swift-tox-func-s3api-py27
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
@ -174,11 +174,11 @@
jobs:
- swift-tox-py27
- swift-tox-py35
- swift-tox-func
- swift-tox-func-encryption
- swift-tox-func-domain-remap-staticweb
- swift-tox-func-ec
- swift-tox-func-s3api
- 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-probetests-centos-7
- openstack-tox-lower-constraints
- openstack-tox-pep8
@ -209,11 +209,11 @@
jobs:
- swift-tox-py27
- swift-tox-py35
- swift-tox-func
- swift-tox-func-encryption
- swift-tox-func-domain-remap-staticweb
- swift-tox-func-ec
- swift-tox-func-s3api
- 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-probetests-centos-7
- openstack-tox-lower-constraints
- openstack-tox-pep8
@ -243,9 +243,9 @@
experimental:
jobs:
- swift-tox-py27-centos-7
- swift-tox-func-centos-7
- swift-tox-func-encryption-centos-7
- swift-tox-func-ec-centos-7
- swift-tox-func-py27-centos-7
- swift-tox-func-encryption-py27-centos-7
- swift-tox-func-ec-py27-centos-7
- legacy-tempest-dsvm-neutron-pg-full:
irrelevant-files:
- ^(test-|)requirements.txt$

View File

@ -85,21 +85,25 @@ basepython = python2.7
commands = ./.functests {posargs}
[testenv:func-encryption]
basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
[testenv:func-domain-remap-staticweb]
basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
[testenv:func-ec]
basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
[testenv:func-s3api]
basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api
@ -155,6 +159,7 @@ commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasen
# FIXME(dhellmann): We'll want to uncomment this
# when the full test suite works with python 3.
# basepython = python3
basepython = python2.7
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt