zuul/zuul-jobs
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2020-04-28 19:09:29 +00:00 committed by Gerrit Code Review
commit fa48a66db3
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,9 @@
- name: Check for results.json
stat:
path: "{{ zuul.executor.work_root }}/results.json"
register: result_json_stat
# 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'] }}"
when: ignore_errors: true
- buildset_registry is not defined
- result_json_stat.stat.exists
- "'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:

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

@ -1,16 +1,9 @@
- name: Check for results.json
stat:
path: "{{ zuul.executor.work_root }}/results.json"
register: result_json_stat
# 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'] }}"
when: ignore_errors: true
- buildset_registry is not defined
- result_json_stat.stat.exists
- "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
- name: Build docker images - name: Build docker images
include_tasks: build.yaml include_tasks: build.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
failed_when: false ignore_errors: true
- name: Create container log dir - name: Create container log dir
file: file: