airship/images
Code Issues Proposed changes

Try to use zuul.image_tag before falling back to default

Browse Source 
Change-Id: I8e2ab0ec014c15d255620698f5c223e974575d48
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2021-02-26 23:06:37 -06:00
parent 5859ab344f
commit f4480cc97a
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/airship-images-build.yaml
View File

@ -43,7 +43,7 @@
DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default('latest') }}"
IMAGE_TAG: "{{ image_tag | default(zuul.image_tag) | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "false"

2
playbooks/airship-images-publish.yaml
View File

@ -47,7 +47,7 @@
DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default('latest') }}"
IMAGE_TAG: "{{ image_tag | default(zuul.image_tag) | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "true"