Merge "Only replace python when re-initializing the venv" into stable/queens
This commit is contained in:
commit
da22c621b0
|
@ -106,11 +106,22 @@
|
|||
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
|
||||
- tempest_get_venv | changed
|
||||
|
||||
# NOTE(odyssey4me):
|
||||
# We reinitialize the venv to ensure that the right
|
||||
# version of python is in the venv, but we do not
|
||||
# want virtualenv to also replace pip, setuptools
|
||||
# and wheel so we tell it not to.
|
||||
# We do not use --always-copy for CentOS/SuSE due
|
||||
# to https://github.com/pypa/virtualenv/issues/565
|
||||
- name: Reset virtualenv and update its paths
|
||||
shell: |
|
||||
find {{ tempest_venv_bin }} -name \*.pyc -delete
|
||||
sed -si '1s/^.*python.*$/#!{{ tempest_venv_bin | replace ('/','\/') }}\/python/' {{ tempest_venv_bin }}/*
|
||||
virtualenv {{ tempest_venv_bin | dirname }}
|
||||
virtualenv {{ tempest_venv_bin | dirname }} \
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||
--no-pip \
|
||||
--no-setuptools \
|
||||
--no-wheel
|
||||
when: tempest_get_venv | changed
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
|
|
Loading…
Reference in New Issue