From f4480cc97aa4c6e0333b9ac52a10b6c6f7ad5e29 Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Fri, 26 Feb 2021 23:06:37 -0600 Subject: [PATCH] Try to use zuul.image_tag before falling back to default Change-Id: I8e2ab0ec014c15d255620698f5c223e974575d48 Signed-off-by: Andrii Ostapenko --- playbooks/airship-images-build.yaml | 2 +- playbooks/airship-images-publish.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/airship-images-build.yaml b/playbooks/airship-images-build.yaml index 1a831a0..87b07c4 100644 --- a/playbooks/airship-images-build.yaml +++ b/playbooks/airship-images-build.yaml @@ -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" diff --git a/playbooks/airship-images-publish.yaml b/playbooks/airship-images-publish.yaml index d10ff42..6a2ab0a 100644 --- a/playbooks/airship-images-publish.yaml +++ b/playbooks/airship-images-publish.yaml @@ -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"