From 52fa1a65a686bb0b65dd8df5687b180bac7a2f34 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Tue, 5 Nov 2019 01:45:26 +0000 Subject: 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 c512574e110c214396658743e75ae497ba76e2ff) ---------- pin lower-constraints to run against python 2.7 (cherry picked from commit 281ffab2a52f348aa3f8ad39e800a43c6047e1cf) ========== Change-Id: I4e7e71cbaeda9e6bfcf4e415dd5f859df4835376 (cherry picked from commit 56ae0c7debd174bd5676ce937482bf9414efa3de) --- .zuul.yaml | 48 ++++++++++++++++++++++++------------------------ tox.ini | 5 +++++ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e9430bdbb..7b4f19ec6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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$ diff --git a/tox.ini b/tox.ini index 2e4fdbffc..9f2fc751e 100644 --- a/tox.ini +++ b/tox.ini @@ -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 -- cgit v1.2.1