zuul/zuul-jobs
Code Issues Proposed changes

Merge "Revert "Revert "Do not set buildset_fact if it's not present in results.json"""

Browse Source
This commit is contained in:
Zuul 2020-05-05 14:35:24 +00:00 committed by Gerrit Code Review
commit 9d7551e4ea
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
roles/build-container-image/tasks/main.yaml
View File

@ -1,9 +1,18 @@
- name: Check for results.json
stat:
path: "{{ zuul.executor.work_root }}/results.json"
register: result_json_stat
delegate_to: localhost
# This can be removed if we add this functionality to Zuul directly # This can be removed if we add this functionality to Zuul directly
- name: Load information from zuul_return - name: Load information from zuul_return
when: buildset_registry is not defined
set_fact: set_fact:
buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}" buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}"
ignore_errors: true when:
- buildset_registry is not defined
- result_json_stat.stat.exists
- result_json_stat.stat.size > 0
- "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
- name: Set container filename arg - name: Set container filename arg
set_fact: set_fact:

13
roles/build-docker-image/tasks/main.yaml
View File

@ -1,9 +1,18 @@
- name: Check for results.json
stat:
path: "{{ zuul.executor.work_root }}/results.json"
register: result_json_stat
delegate_to: localhost
# This can be removed if we add this functionality to Zuul directly # This can be removed if we add this functionality to Zuul directly
- name: Load information from zuul_return - name: Load information from zuul_return
when: buildset_registry is not defined
set_fact: set_fact:
buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}" buildset_registry: "{{ (lookup('file', zuul.executor.work_root + '/results.json') | from_json)['buildset_registry'] }}"
ignore_errors: true when:
- buildset_registry is not defined
- result_json_stat.stat.exists
- result_json_stat.stat.size > 0
- "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
- name: Set up siblings - name: Set up siblings
include_tasks: siblings.yaml include_tasks: siblings.yaml

2
roles/collect-container-logs/tasks/main.yaml
View File

@ -1,7 +1,7 @@
- name: List containers - name: List containers
command: "{{ container_command }} ps -a --format '{{ '{{ .Names }}' }}'" command: "{{ container_command }} ps -a --format '{{ '{{ .Names }}' }}'"
register: docker_containers register: docker_containers
ignore_errors: true failed_when: false
- name: Create container log dir - name: Create container log dir
file: file: