diff options
| author | Tim Burke <tim.burke@gmail.com> | 2022-11-03 10:31:21 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-11-03 15:39:05 -0700 |
| commit | 052abed755c8447a2ceff27f09614179965aac4e (patch) | |
| tree | 47d78c4e93953d1f77efa911b1641f2360daeb44 /.zuul.yaml | |
| parent | 32600ee56bde7ee8bc4b8e38440d24f65b505cc0 (diff) | |
| download | swift-052abed755c8447a2ceff27f09614179965aac4e.tar.gz | |
Move base CI job to jammy
We'll want that by the time we can add a py310 job. It'll also make us
be explicit about the OS to use for py27 and py36-py39 jobs.
Also, update bindep so we don't try to install py2 stuff on jammy.
Change-Id: If70cd2fc03d10e55cd782ec8ffc87bd2b2b321ea
Diffstat (limited to '.zuul.yaml')
| -rw-r--r-- | .zuul.yaml | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index f6ab8dfdd..210640b63 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,7 @@ - job: name: swift-tox-base - parent: openstack-tox-py27 + parent: openstack-tox-py310 + nodeset: ubuntu-jammy description: | Base job for swift-tox jobs. @@ -14,6 +15,7 @@ - job: name: swift-tox-py27 parent: swift-tox-base + nodeset: ubuntu-bionic description: | Run unit-tests for swift under cPython version 2.7. @@ -22,6 +24,7 @@ tools/test-setup.sh. vars: tox_envlist: py27 + python_version: 2.7 tox_environment: NOSE_COVER_HTML: 1 NOSE_COVER_HTML_DIR: '{toxinidir}/cover' @@ -29,8 +32,11 @@ - job: name: swift-tox-py27-centos-7 - parent: swift-tox-py27 + parent: openstack-tox-py27 nodeset: centos-7 + vars: + tox_environment: + TMPDIR: '{{ ansible_env.HOME }}/xfstmp' - job: name: swift-tox-py36 @@ -45,6 +51,7 @@ vars: tox_envlist: py36 bindep_profile: test py36 + python_version: 3.6 tox_environment: NOSE_COVER_HTML: 1 NOSE_COVER_HTML_DIR: '{toxinidir}/cover' @@ -131,6 +138,7 @@ - job: name: swift-tox-func-py27 parent: swift-tox-base + nodeset: ubuntu-bionic description: | Run functional tests for swift under cPython version 2.7. @@ -139,6 +147,8 @@ tools/test-setup.sh. vars: tox_envlist: func + bindep_profile: test py27 + python_version: 2.7 - job: name: swift-tox-func-py38 @@ -225,12 +235,13 @@ - job: name: swift-tox-func-py27-centos-7 - parent: swift-tox-func-py27 - nodeset: centos-7 + parent: swift-tox-py27-centos-7 + vars: + tox_envlist: func - job: name: swift-tox-func-encryption-py27 - parent: swift-tox-base + parent: swift-tox-func-py27 description: | Run functional tests for swift under cPython version 2.7. @@ -242,12 +253,13 @@ - job: name: swift-tox-func-encryption-py27-centos-7 - parent: swift-tox-func-encryption-py27 - nodeset: centos-7 + parent: swift-tox-func-py27-centos-7 + vars: + tox_envlist: func-encryption - job: name: swift-tox-func-ec-py27 - parent: swift-tox-base + parent: swift-tox-func-py27 description: | Run functional tests for swift under cPython version 2.7. @@ -259,8 +271,9 @@ - job: name: swift-tox-func-ec-py27-centos-7 - parent: swift-tox-func-ec-py27 - nodeset: centos-7 + parent: swift-tox-func-py27-centos-7 + vars: + tox_envlist: func-ec - job: name: swift-dsvm-functional |