zuul/zuul-jobs
Code Issues Proposed changes

Fix bare 'item' in build-container-image

Browse Source 
Move the setting of the containerfile into the loop (thus in build.yaml)
to follow the semantics from roles/build-container-image/common.rst for
container_filename and container_images.container_filename.

Co-Authored-By: Andreas Jaeger <aj@suse.com>
Change-Id: Id39f13cc666e9f99557447073cc0d362991f3506
This commit is contained in:
Albin Vass 2020-05-04 17:11:32 +02:00
parent 8f52832e1f
commit a7b4e5e906
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/build-container-image/tasks/build.yaml
View File

@ -25,6 +25,10 @@
loop_var: zj_sibling loop_var: zj_sibling
when: item.siblings is defined when: item.siblings is defined
- name: Set container filename arg
set_fact:
containerfile: "{{ item.container_filename|default(container_filename)|default('') }}"
- name: Build a container image - name: Build a container image
command: >- command: >-
{{ container_command }} build {{ item.path | default('.') }} {% if containerfile %}-f {{ containerfile }}{% endif %} {{ container_command }} build {{ item.path | default('.') }} {% if containerfile %}-f {{ containerfile }}{% endif %}

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

@ -14,10 +14,6 @@
- result_json_stat.stat.size > 0 - result_json_stat.stat.size > 0
- "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)" - "'buildset_registry' in (lookup('file', zuul.executor.work_root + '/results.json') | from_json)"
- name: Set container filename arg
set_fact:
containerfile: "{{ item.container_filename|default(container_filename|default('')) }}"
- name: Build container images - name: Build container images
include_tasks: build.yaml include_tasks: build.yaml
loop: "{{ container_images }}" loop: "{{ container_images }}"