diff options
| author | Tim Burke <tim.burke@gmail.com> | 2022-10-26 15:15:15 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-10-26 21:25:02 -0700 |
| commit | 3571cdf2f77978f9a8c835a66048278ce8086473 (patch) | |
| tree | 4fc2e5fe5fd623ba7a1d066f385a00bd1aeb38d3 /.zuul.yaml | |
| parent | 8d541fed4ee12d8472c15a62049de6c14bc0b02a (diff) | |
| download | swift-3571cdf2f77978f9a8c835a66048278ce8086473.tar.gz | |
CI: Install pip from pinned upstream for py2 probe tests
As part of that, invert the inheritance so the py2 job derives from the
py3 job.
Change-Id: If8efd9a0fd18d17444a58119c525ff54cfd55dd9
Diffstat (limited to '.zuul.yaml')
| -rw-r--r-- | .zuul.yaml | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index cba0688cb..f6ab8dfdd 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -345,30 +345,36 @@ - job: name: swift-probetests-centos-7 - parent: unittests + parent: swift-probetests-centos-8-stream nodeset: centos-7 description: | Setup a SAIO dev environment and run Swift's probe tests under Python 2. - timeout: 7200 vars: bindep_profile: test py27 - pre-run: - - tools/playbooks/common/install_dependencies.yaml - - tools/playbooks/saio_single_node_setup/setup_saio.yaml - - tools/playbooks/saio_single_node_setup/make_rings.yaml - run: tools/playbooks/probetests/run.yaml - post-run: tools/playbooks/probetests/post.yaml + ensure_pip_from_packages: False + ensure_pip_from_packages_with_python2: False + ensure_pip_from_upstream: True + ensure_pip_from_upstream_interpreters: + - python2 + ensure_pip_from_upstream_url: "https://bootstrap.pypa.io/pip/2.7/get-pip.py" - job: name: swift-probetests-centos-8-stream - parent: swift-probetests-centos-7 + parent: unittests nodeset: centos-8-stream description: | Setup a SAIO dev environment and run Swift's probe tests under Python 3. + timeout: 7200 vars: bindep_profile: test py36 + pre-run: + - tools/playbooks/common/install_dependencies.yaml + - tools/playbooks/saio_single_node_setup/setup_saio.yaml + - tools/playbooks/saio_single_node_setup/make_rings.yaml + run: tools/playbooks/probetests/run.yaml + post-run: tools/playbooks/probetests/post.yaml - job: name: swift-probetests-centos-8-stream-arm64 |