airship/airshipctl
Code Issues Proposed changes

Use Zuul project variable for build images

Browse Source 
Change-Id: Ie3b5ca9f17d3f908e7771dd5a6a6b09b9ee409c8
This commit is contained in:
Shturm, Svetlana 2021-04-14 15:21:18 -05:00 committed by Shturm Svetlana
parent a0cfddab1b
commit dd9a904fcd
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/airshipctl-build-images/tasks/main.yaml
View File

@ -18,12 +18,15 @@
PROXY: "{{ proxy.http }}" PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}" NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}" 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_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_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_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"
DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}" DOCKER_BASE_PLUGINS_RELEASE_IMAGE: "{{ docker.base_plugins_release_image | default(omit) }}"
- name: Verify Image Exists - 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: args:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"

2
roles/airshipctl-publish-images/tasks/main.yaml
View File

@ -38,7 +38,7 @@
NO_PROXY: "{{ proxy.noproxy }}" NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}" USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ image_repo }}" 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_GO_IMAGE: "{{ docker.base_go_image | default(omit) }}"
DOCKER_BASE_RELEASE_IMAGE: "{{ docker.base_release_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_BUILD_IMAGE: "{{ docker.base_plugins_build_image | default(omit) }}"

1
zuul.d/projects.yaml
View File

@ -19,6 +19,7 @@
https: "" https: ""
noproxy: "" noproxy: ""
image_repo: quay.io image_repo: quay.io
image_prefix: airshipit
docker: docker:
base_go_image: "" base_go_image: ""
base_release_image: "" base_release_image: ""