zuul/zuul-jobs
Code Issues Proposed changes

Merge "tox: envlist bugfixes"

Browse Source
This commit is contained in:
Zuul 2020-05-27 16:20:12 +00:00 committed by Gerrit Code Review
commit 3d64b59f00
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/fetch-tox-output/tasks/main.yaml
View File

@ -24,9 +24,17 @@
set_fact: set_fact:
envlist: "{{ tox_envlist.split(',') }}" envlist: "{{ tox_envlist.split(',') }}"
when: tox_envlist is defined and tox_envlist != 'ALL' and tox_envlist when: tox_envlist is defined and tox_envlist != 'ALL' and tox_envlist
# tox version <= 3.13.2 throws an exception if
# tox -l is run and envlist is not set so set
# failed_when: false for any version below that
- name: Get tox version
command: "{{ tox_executable }} --version"
register: tox_version_output
- name: Find all default environments - name: Find all default environments
command: "{{ tox_executable }} -l" command: "{{ tox_executable }} -l"
failed_when: "{{ tox_default_environments is failed and tox_version_output.stdout | regex_search('\\d+\\.\\d+\\.\\d+') is version('3.13.2', '>') }}"
args: args:
chdir: "{{ zuul_work_dir }}" chdir: "{{ zuul_work_dir }}"
register: tox_default_environments register: tox_default_environments

1
roles/tox/tasks/main.yaml
View File

@ -61,6 +61,7 @@
- name: Return file comments to Zuul - name: Return file comments to Zuul
when: when:
- tox_inline_comments - tox_inline_comments
- file_comments.file_comments is defined
- file_comments.file_comments - file_comments.file_comments
delegate_to: localhost delegate_to: localhost
zuul_return: zuul_return: