ensure-pip: export ensure_pip_virtualenv_command

This makes ensure-pip export something that should be sensible for
users of pip: to put in their 'virtualenv_command' for their host.

The theory of operation is fairly simple; see if "python3 -m venv"
looks like it works, and set that as the command if it does.  If not,
set "virtualenv".  For sanity, we check if it works.

We pull in virtualenv in the Python 2 case, but for Python 3 we are
deliberately do not bring it as it is an unnecessary dependency.  If
jobs do require the actual `virtualenv` package, they should provision
it themselves ... except for Xenial, which, as described inline, has
issues.

Follow-on changes will convert existing zuul-jobs roles that install
tools into virtualenvs to use this argument.

Change-Id: Idad14c0e77eed5bf8df2c8f84f52fbdea2236a9f
This commit is contained in:
Ian Wienand 2020-04-08 06:26:47 +10:00 committed by Clark Boylan
parent fbf8242401
commit 6dce7ba605
5 changed files with 69 additions and 0 deletions

View File

@ -3,6 +3,7 @@
name: name:
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- python3-venv
become: yes become: yes
- name: Install Python 2 pip - name: Install Python 2 pip

View File

@ -34,6 +34,7 @@
name: name:
- python-pip - python-pip
- python-setuptools - python-setuptools
- python-virtualenv
state: present state: present
become: yes become: yes
when: (ensure_pip_from_packages_with_python2) or when: (ensure_pip_from_packages_with_python2) or

View File

@ -29,6 +29,7 @@
- name: Install pip from packages - name: Install pip from packages
include: "{{ item }}" include: "{{ item }}"
with_first_found: with_first_found:
- "{{ ansible_distribution_release }}.yaml"
- "{{ ansible_distribution }}.yaml" - "{{ ansible_distribution }}.yaml"
- "{{ ansible_os_family }}.yaml" - "{{ ansible_os_family }}.yaml"
- "default.yaml" - "default.yaml"
@ -41,3 +42,34 @@
when: when:
- ensure_pip_from_upstream - ensure_pip_from_upstream
- pip_preinstalled.rc != 0 - pip_preinstalled.rc != 0
#
# virtualenv setup
#
- name: Probe for venv
command: /usr/bin/python3 -m venv --help
no_log: True
failed_when: false
register: _venv_probe
- name: Set host default
set_fact:
_host_virtualenv: '{{ (_venv_probe.rc == 0) | ternary("/usr/bin/python3 -m venv", "virtualenv") }}'
when: ansible_distribution_release != 'xenial'
# The pip included with Xenial (version ~8) has issues with our wheel
# mirrors; it will not correctly look to upstream pypi when it can't
# find the wheel in the configured mirror, so virutalenv creation
# fails. venv uses the system pip version; for this reason we need to
# use virtualenv which does upgrade pip in the environment; but note
# that on Xenial "virtualenv" is owned by the python2 package; so we
# specify the command to python3 directly.
- name: Set host default (Xenial)
set_fact:
_host_virtualenv: '/usr/bin/python3 -m virtualenv'
when: ansible_distribution_release == 'xenial'
- name: Set ensure_pip_virtualenv_cmd
set_fact:
ensure_pip_virtualenv_command: '{{ ensure_pip_virtualenv_command | default(_host_virtualenv) }}'
cacheable: true

View File

@ -0,0 +1,20 @@
# See notes in main.yaml about the virtualenv requirements
- name: Install Python 3 pip
package:
name:
- python3-pip
- python3-setuptools
- python3-venv
- python3-virtualenv
become: yes
- name: Install Python 2 pip
package:
name:
- python-setuptools
- python-pip
- python-virtualenv
become: yes
when: (ensure_pip_from_packages_with_python2) or
(ansible_python.version.major == 2)

View File

@ -1,6 +1,21 @@
- hosts: all - hosts: all
roles: roles:
- ensure-pip - ensure-pip
tasks:
- name: Sanity check provided virtualenv command works
shell: |
tmp_venv=$(mktemp -d -t venv-XXXXXXXXXX)
trap "rm -rf $tmp_venv" EXIT
{{ ensure_pip_virtualenv_command }} $tmp_venv
$tmp_venv/bin/pip install tox
failed_when: false
register: _venv_sanity
- name: Assert sanity check
fail:
msg: 'The virtualenv_command: "{{ ensure_pip_virtualenv_command }}" does not appear to work!'
when:
- _venv_sanity.rc != 0
# NOTE(ianw) : this does not play nicely with pip-and-virtualenv which # NOTE(ianw) : this does not play nicely with pip-and-virtualenv which
# has already installed from source. We might be able to test this # has already installed from source. We might be able to test this