openstack/openstack-ansible-repo_build
Code Issues Proposed changes

Merge "Constrain the pip/setuptools/wheel versions in the venvs"

Browse Source
This commit is contained in:
Zuul 2018-04-18 16:32:08 +00:00 committed by Gerrit Code Review
commit 3f96d62164
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/repo_build_venvs.yml
View File

@ -34,6 +34,7 @@
src: "venv-build-script.sh.j2" src: "venv-build-script.sh.j2"
dest: "/opt/venv-build-script.sh" dest: "/opt/venv-build-script.sh"
mode: "0755" mode: "0755"
register: _create_venv_build_script
- name: Create venv build options files - name: Create venv build options files
template: template:
@ -48,6 +49,7 @@
executable: "/bin/bash" executable: "/bin/bash"
when: when:
- (item | changed) or - (item | changed) or
(_create_venv_build_script | changed) or
(ansible_local['openstack_ansible']['repo_build']['need_venv_build'] | bool) (ansible_local['openstack_ansible']['repo_build']['need_venv_build'] | bool)
with_items: with_items:
- "{{ _create_venv_options_files.results }}" - "{{ _create_venv_options_files.results }}"

4
templates/venv-build-script.sh.j2
View File

@ -85,7 +85,9 @@ pushd "{{ repo_build_venv_dir }}" &>/dev/null
${ROLE_VENV_PATH}/bin/python {{ repo_build_release_path }}/get-pip.py \ ${ROLE_VENV_PATH}/bin/python {{ repo_build_release_path }}/get-pip.py \
pip setuptools wheel \ pip setuptools wheel \
--find-links {{ repo_build_release_path }} \ --find-links {{ repo_build_release_path }} \
${PIP_INSTALL_OPTIONS} &>${ROLE_VENV_LOG} ${PIP_INSTALL_OPTIONS} \
--constraint {{ repo_build_release_path }}/requirements_constraints.txt \
&>${ROLE_VENV_LOG}
# Install the packages into the venv # Install the packages into the venv
${ROLE_VENV_PATH}/bin/pip install \ ${ROLE_VENV_PATH}/bin/pip install \