Merge "Partial revert "Ensure wheel exists for build-release-python"; move to ensure-pip"
This commit is contained in:
Zuul
Gerrit Code Review
commit
1a8d5ca838
@ -11,7 +11,6 @@ Python Roles
|
||||
.. zuul:autorole:: ensure-tox
|
||||
.. zuul:autorole:: ensure-twine
|
||||
.. zuul:autorole:: ensure-virtualenv
|
||||
.. zuul:autorole:: ensure-wheel
|
||||
.. zuul:autorole:: fetch-coverage-output
|
||||
.. zuul:autorole:: fetch-python-sdist-output
|
||||
.. zuul:autorole:: fetch-sphinx-output
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
- hosts: all
|
||||
roles:
|
||||
- role: ensure-wheel
|
||||
wheel_python: "{{ release_python | default(python) }}"
|
||||
@ -5,7 +5,8 @@ Build sdist and wheel for Python projects.
|
||||
.. zuul:rolevar:: release_python
|
||||
:default: python
|
||||
|
||||
The python interpreter to use. Defaults to "python".
|
||||
The python interpreter to use. Set it to "python3" to use python 3,
|
||||
for example.
|
||||
|
||||
.. zuul:rolevar:: bdist_wheel_xargs
|
||||
:default: ''
|
||||
|
||||
@ -11,6 +11,9 @@ platforms. On some platforms it may install the package under the
|
||||
Python 2 interpreter and in others Python 3. You should use a
|
||||
qualified name (``pip2`` or ``pip3``) to avoid confusion.
|
||||
|
||||
This role will also ``wheel`` components sufficient to run
|
||||
``bdist_wheel`` builds or ``pip wheel`` on a source tree.
|
||||
|
||||
**Role Variables**
|
||||
|
||||
.. zuul:rolevar:: ensure_pip_from_packages
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
- python3-pip
|
||||
- python3-setuptools
|
||||
- python3-venv
|
||||
- python3-wheel
|
||||
become: yes
|
||||
|
||||
- name: Install Python 2 pip
|
||||
@ -11,5 +12,6 @@
|
||||
name:
|
||||
- python-setuptools
|
||||
- python-pip
|
||||
- python-wheel
|
||||
become: yes
|
||||
when: ensure_pip_from_packages_with_python2
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
- name: Install Python 3 pip
|
||||
package:
|
||||
name: dev-python/pip
|
||||
name:
|
||||
- dev-python/pip
|
||||
- dev-python/wheel
|
||||
become: yes
|
||||
|
||||
- name: Install Python 2 pip
|
||||
package:
|
||||
name: dev-python/pip
|
||||
name:
|
||||
- dev-python/pip
|
||||
- dev-python/wheel
|
||||
become: yes
|
||||
when:
|
||||
- ensure_pip_from_packages_with_python2
|
||||
|
||||
@ -3,9 +3,8 @@
|
||||
name:
|
||||
- python3-pip
|
||||
- python3-setuptools
|
||||
- python3-wheel
|
||||
state: present
|
||||
when:
|
||||
- ansible_python.version.major == 3
|
||||
become: yes
|
||||
|
||||
- name: Install Python 2 pip
|
||||
@ -14,7 +13,9 @@
|
||||
- python-pip
|
||||
- python-setuptools
|
||||
- python-virtualenv
|
||||
- python-wheel
|
||||
state: present
|
||||
enablerepo: epel
|
||||
become: yes
|
||||
when: ensure_pip_from_packages_with_python2
|
||||
when: ensure_pip_from_packages_with_python2 or
|
||||
ansible_python.version.major == 2
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
- name: Install Python 3 pip
|
||||
package:
|
||||
name: python3-pip
|
||||
name:
|
||||
- python3-pip
|
||||
- python3-wheel
|
||||
become: yes
|
||||
|
||||
- name: Install Python 2 pip
|
||||
package:
|
||||
name: python2-pip
|
||||
name:
|
||||
- python2-pip
|
||||
- python2-wheel
|
||||
become: yes
|
||||
when: ensure_pip_from_packages_with_python2
|
||||
|
||||
@ -17,9 +17,11 @@
|
||||
# is present.
|
||||
if [ "$PYTHON2" -eq "1" ] ; then
|
||||
command -v pip2 || command -v pip || exit 1
|
||||
python2 -m wheel --help || exit 1
|
||||
fi
|
||||
if [ "$PYTHON3" -eq "1" ] ; then
|
||||
command -v pip3 || command -v pip || exit 1
|
||||
python3 -m wheel --help || exit 1
|
||||
fi
|
||||
args:
|
||||
executable: /bin/bash
|
||||
|
||||
@ -16,6 +16,13 @@
|
||||
loop_control:
|
||||
loop_var: zj_item
|
||||
|
||||
- name: 'Install wheel'
|
||||
command: '{{ zj_item }} -m pip install wheel'
|
||||
become: yes
|
||||
loop: '{{ ensure_pip_from_upstream_interpreters }}'
|
||||
loop_control:
|
||||
loop_var: zj_item
|
||||
|
||||
- name: Remove temporary install dir
|
||||
file:
|
||||
state: absent
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
- python3-pip
|
||||
- python3-setuptools
|
||||
- python3-venv
|
||||
- python3-wheel
|
||||
become: yes
|
||||
|
||||
- name: Install Python 2 pip
|
||||
@ -19,6 +20,7 @@
|
||||
name:
|
||||
- python-setuptools
|
||||
- python-pip
|
||||
- python-wheel
|
||||
become: yes
|
||||
when: ensure_pip_from_packages_with_python2
|
||||
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Ensure wheel exists for Python projects.
|
||||
|
||||
**Role Variables**
|
||||
|
||||
.. zuul:rolevar:: wheel_python
|
||||
:default: python3
|
||||
|
||||
The python interpreter to use. Defaults to "python3".
|
||||
|
||||
@ -1 +0,0 @@
|
||||
wheel_python: python3
|
||||
@ -1,15 +0,0 @@
|
||||
- name: Check for wheel
|
||||
command: "{{ wheel_python }} -m wheel"
|
||||
failed_when: false
|
||||
register: wheel_exists
|
||||
|
||||
- name: Include ensure-pip
|
||||
vars:
|
||||
ensure_pip_from_upstream_interpreters: "{{ wheel_python }}"
|
||||
include_role:
|
||||
name: ensure-pip
|
||||
when: wheel_exists.rc != 0
|
||||
|
||||
- name: Install wheel
|
||||
command: "{{ wheel_python }} -m pip install --user wheel"
|
||||
when: wheel_exists.rc != 0
|
||||
@ -26,6 +26,14 @@
|
||||
path: '{{ _tmp_venv.path }}'
|
||||
state: absent
|
||||
|
||||
- name: Sanity check pip wheel generation
|
||||
shell: |
|
||||
cd {{ ansible_user_dir }}/src/opendev.org/zuul/zuul
|
||||
# This should run anywhere without too much logic ...
|
||||
run_pip=$(command -v pip3 || command -v pip2 || command -v pip)
|
||||
$run_pip wheel --no-deps .
|
||||
ls zuul-*.whl || exit 1
|
||||
|
||||
# ensure-virtualenv
|
||||
- name: Include ensure-virtualenv
|
||||
include_role:
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-pip
|
||||
description: Test the ensure-pip role
|
||||
# dummy project for wheel build test
|
||||
required-projects:
|
||||
- zuul/zuul
|
||||
files:
|
||||
- roles/ensure-pip/.*
|
||||
- roles/ensure-virtualenv/.*
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
vars:
|
||||
role_name: build-python-release
|
||||
release_python: python3
|
||||
pre-run: playbooks/python/release-pre.yaml
|
||||
pre-run: playbooks/python/pre.yaml
|
||||
run: test-playbooks/simple-role-test.yaml
|
||||
tags: all-platforms
|
||||
|
||||
@ -103,123 +103,14 @@
|
||||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs
|
||||
description: Test the ensure-wheel role
|
||||
files:
|
||||
- roles/ensure-wheel/.*
|
||||
- setup.cfg
|
||||
- setup.py
|
||||
vars:
|
||||
role_name: ensure-wheel
|
||||
run: test-playbooks/simple-role-test.yaml
|
||||
tags: all-platforms
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-centos-7
|
||||
description: Test the ensure-wheel role on centos-7
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-7
|
||||
label: centos-7
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-centos-8
|
||||
description: Test the ensure-wheel role on centos-8
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: centos-8
|
||||
label: centos-8
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-debian-stretch
|
||||
description: Test the ensure-wheel role on debian-stretch
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: debian-stretch
|
||||
label: debian-stretch
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-fedora-31
|
||||
description: Test the ensure-wheel role on fedora-31
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: fedora-31
|
||||
label: fedora-31
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-gentoo-17-0-systemd
|
||||
description: Test the ensure-wheel role on gentoo-17-0-systemd
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: gentoo-17-0-systemd
|
||||
label: gentoo-17-0-systemd
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-opensuse-15
|
||||
description: Test the ensure-wheel role on opensuse-15
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: opensuse-15
|
||||
label: opensuse-15
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-opensuse-tumbleweed-nv
|
||||
voting: false
|
||||
description: Test the ensure-wheel role on opensuse-tumbleweed
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: opensuse-tumbleweed
|
||||
label: opensuse-tumbleweed
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-ubuntu-bionic
|
||||
description: Test the ensure-wheel role on ubuntu-bionic
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: ubuntu-bionic
|
||||
label: ubuntu-bionic
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-wheel-jobs-ubuntu-xenial
|
||||
description: Test the ensure-wheel role on ubuntu-xenial
|
||||
parent: zuul-jobs-test-ensure-wheel-jobs
|
||||
tags: auto-generated
|
||||
nodeset:
|
||||
nodes:
|
||||
- name: ubuntu-xenial
|
||||
label: ubuntu-xenial
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-python-pyenv
|
||||
description: Test the ensure-python role with pyenv
|
||||
files:
|
||||
- roles/ensure-python/.*
|
||||
- test-playbooks/ensure-python-pyenv.yaml
|
||||
- zuul-tests.d/python-roles-jobs.yaml
|
||||
run: test-playbooks/ensure-python-pyenv.yaml
|
||||
tags: all-platforms
|
||||
|
||||
# -* AUTOGENERATED *-
|
||||
# The following project section is autogenerated by
|
||||
# tools/update-test-platforms.py
|
||||
# Please re-run to generate new job lists
|
||||
|
||||
- job:
|
||||
name: zuul-jobs-test-ensure-python-pyenv-centos-7
|
||||
description: Test the ensure-python role with pyenv on centos-7
|
||||
@ -323,15 +214,6 @@
|
||||
- zuul-jobs-test-build-python-release-jobs-opensuse-tumbleweed-nv
|
||||
- zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
|
||||
- zuul-jobs-test-build-python-release-jobs-ubuntu-xenial
|
||||
- zuul-jobs-test-ensure-wheel-jobs-centos-7
|
||||
- zuul-jobs-test-ensure-wheel-jobs-centos-8
|
||||
- zuul-jobs-test-ensure-wheel-jobs-debian-stretch
|
||||
- zuul-jobs-test-ensure-wheel-jobs-fedora-31
|
||||
- zuul-jobs-test-ensure-wheel-jobs-gentoo-17-0-systemd
|
||||
- zuul-jobs-test-ensure-wheel-jobs-opensuse-15
|
||||
- zuul-jobs-test-ensure-wheel-jobs-opensuse-tumbleweed-nv
|
||||
- zuul-jobs-test-ensure-wheel-jobs-ubuntu-bionic
|
||||
- zuul-jobs-test-ensure-wheel-jobs-ubuntu-xenial
|
||||
- zuul-jobs-test-ensure-python-pyenv-centos-7
|
||||
- zuul-jobs-test-ensure-python-pyenv-centos-8
|
||||
- zuul-jobs-test-ensure-python-pyenv-debian-stretch
|
||||
@ -351,14 +233,6 @@
|
||||
- zuul-jobs-test-build-python-release-jobs-opensuse-15
|
||||
- zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
|
||||
- zuul-jobs-test-build-python-release-jobs-ubuntu-xenial
|
||||
- zuul-jobs-test-ensure-wheel-jobs-centos-7
|
||||
- zuul-jobs-test-ensure-wheel-jobs-centos-8
|
||||
- zuul-jobs-test-ensure-wheel-jobs-debian-stretch
|
||||
- zuul-jobs-test-ensure-wheel-jobs-fedora-31
|
||||
- zuul-jobs-test-ensure-wheel-jobs-gentoo-17-0-systemd
|
||||
- zuul-jobs-test-ensure-wheel-jobs-opensuse-15
|
||||
- zuul-jobs-test-ensure-wheel-jobs-ubuntu-bionic
|
||||
- zuul-jobs-test-ensure-wheel-jobs-ubuntu-xenial
|
||||
- zuul-jobs-test-ensure-python-pyenv-centos-7
|
||||
- zuul-jobs-test-ensure-python-pyenv-centos-8
|
||||
- zuul-jobs-test-ensure-python-pyenv-debian-stretch
|
||||
|
||||
@ -249,7 +249,7 @@
|
||||
name: build-python-release
|
||||
description: |
|
||||
Build a source tarball and a bdist wheel for uploading.
|
||||
pre-run: playbooks/python/release-pre.yaml
|
||||
pre-run: playbooks/python/pre.yaml
|
||||
run: playbooks/python/release.yaml
|
||||
post-run: playbooks/python/tarball-post.yaml
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user