From dd9a904fcd8d3d022955fcde108d98e39fc1bc3c Mon Sep 17 00:00:00 2001
From: "Shturm, Svetlana" <sshturm@mirantis.com>
Date: Wed, 14 Apr 2021 15:21:18 -0500
Subject: [PATCH] Use Zuul project variable for build images

Change-Id: Ie3b5ca9f17d3f908e7771dd5a6a6b09b9ee409c8
---
 roles/airshipctl-build-images/tasks/main.yaml   | 5 ++++-
 roles/airshipctl-publish-images/tasks/main.yaml | 2 +-
 zuul.d/projects.yaml                            | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/roles/airshipctl-build-images/tasks/main.yaml b/roles/airshipctl-build-images/tasks/main.yaml
index 5d1e5ab7f..c76ab6e0b 100644
--- a/roles/airshipctl-build-images/tasks/main.yaml
+++ b/roles/airshipctl-build-images/tasks/main.yaml
@@ -18,12 +18,15 @@
       PROXY: "{{ proxy.http }}"
       NO_PROXY: "{{ proxy.noproxy }}"
       USE_PROXY: "{{ proxy.enabled | lower }}"
+      DOCKER_REGISTRY: "{{ image_repo }}"
+      DOCKER_IMAGE_TAG: "{{ zuul.change }}"
+      DOCKER_IMAGE_PREFIX: "{{ image_prefix }}"
       DOCKER_BASE_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
       DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_image | default(omit) }}"
       DOCKER_BASE_PLUGINS_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
       DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
 
 - name: Verify Image Exists
-  shell: docker image inspect "$(make print-docker-image-tag)"
+  shell: docker image inspect "$(make DOCKER_REGISTRY={{ image_repo }} DOCKER_IMAGE_PREFIX={{ image_prefix }} DOCKER_IMAGE_TAG={{ zuul.change }} print-docker-image-tag)"
   args:
     chdir: "{{ zuul.project.src_dir }}"
diff --git a/roles/airshipctl-publish-images/tasks/main.yaml b/roles/airshipctl-publish-images/tasks/main.yaml
index 88503242f..14701fbb8 100644
--- a/roles/airshipctl-publish-images/tasks/main.yaml
+++ b/roles/airshipctl-publish-images/tasks/main.yaml
@@ -38,7 +38,7 @@
           NO_PROXY: "{{ proxy.noproxy }}"
           USE_PROXY: "{{ proxy.enabled | lower }}"
           DOCKER_REGISTRY: "{{ image_repo }}"
-          DOCKER_IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
+          DOCKER_IMAGE_PREFIX: "{{ image_prefix }}"
           DOCKER_BASE_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
           DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_image | default(omit) }}"
           DOCKER_BASE_PLUGINS_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 1e9ac0823..5a872bc3c 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -19,6 +19,7 @@
         https: ""
         noproxy: ""
       image_repo: quay.io
+      image_prefix: airshipit
       docker:
         base_go_image: ""
         base_release_image: ""