zuul/zuul-jobs
Code Issues Proposed changes

Change tox-siblings disablement to allow opt-in

Browse Source 
The relevant section is already protected by a variable. Instead of
commenting out the call, set the default value of the flag to false.
This allows people who need the functionality and are not broken by the
existing issue to use it.

Change-Id: Ifa5cc3e335b9e9ad52c4c5c9ab71aaea70d4c9aa
This commit is contained in:
Monty Taylor 2017-10-21 13:18:49 +02:00
parent f0098374b4
commit 98c9285361
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/tox-siblings/defaults/main.yaml
View File

@ -1,6 +1,7 @@
--- ---
tox_envlist: venv tox_envlist: venv
tox_executable: tox tox_executable: tox
tox_install_siblings: true # NOTE(jeblair) disabled because of lack of constraints support
tox_install_siblings: false
zuul_work_dir: "{{ zuul.project.src_dir }}" zuul_work_dir: "{{ zuul.project.src_dir }}"

13
roles/tox-siblings/tasks/main.yaml
View File

@ -10,10 +10,9 @@
when: tox_install_siblings when: tox_install_siblings
# TODO(mordred) handle tox_envlist being a list # TODO(mordred) handle tox_envlist being a list
# NOTE(jeblair) disabled because of lack of constraints support - name: Install any sibling python packages
#- name: Install any sibling python packages tox_install_sibling_packages:
# tox_install_sibling_packages: tox_envlist: "{{ tox_envlist }}"
# tox_envlist: "{{ tox_envlist }}" project_dir: "{{ zuul_work_dir }}"
# project_dir: "{{ zuul_work_dir }}" projects: "{{ zuul.projects | selectattr('required') | list }}"
# projects: "{{ zuul.projects | selectattr('required') | list }}" when: tox_install_siblings
# when: tox_install_siblings