zuul/zuul-jobs
Code Issues Proposed changes

Merge "Add zuul labels to images and ability to user-define more"

Browse Source
This commit is contained in:
Zuul 2020-05-04 19:19:40 +00:00 committed by Gerrit Code Review
commit f6806447b7
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/build-docker-image/common.rst
View File

@ -130,4 +130,10 @@ using this role.
added with each sibling project. Note that projects here must added with each sibling project. Note that projects here must
be listed in ``required-projects``. be listed in ``required-projects``.
.. zuul:rolevar:: labels
:type: list
:default: []
A list of labels to attach to the built image, in the form of "key=value".
.. _anchors: https://yaml.org/spec/1.2/spec.html#&%20anchor// .. _anchors: https://yaml.org/spec/1.2/spec.html#&%20anchor//

5
roles/build-docker-image/tasks/build.yaml
View File

@ -45,6 +45,11 @@
{% endif -%} {% endif -%}
--tag {{ item.repository }}:{{ tag }} --tag {{ item.repository }}:{{ tag }}
{% endfor -%} {% endfor -%}
{% for label in zj_image.labels | default([]) -%}
--label "{{ label }}"
{% endfor %}
--label "org.zuul-ci.change={{ zuul.change }}"
--label "org.zuul-ci.change_url={{ zuul.change_url }}"
args: args:
chdir: "{{ zuul_work_dir }}/{{ item.context }}" chdir: "{{ zuul_work_dir }}/{{ item.context }}"