airship/images
Code Issues Proposed changes

Allow to run role passed from variable

Browse Source 
Change-Id: Icf47ee108dcfcb9792f83d16a5d6bdbcd70eb22f
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2021-02-28 17:25:53 -06:00
parent a7708d75f8
commit aa3e83ab72
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,10 @@
pip: pip:
name: docker name: docker
executable: pip3 executable: pip3
- name: Execute custom role
include_role:
name: "{{ pre_build_role }}"
when: pre_build_role is defined
- name: Publish images - name: Publish images
block: block:
- make: - make:
@ -43,7 +47,7 @@
DOCKER_REGISTRY: "{{ docker_registry }}" DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}" GCP_SDK: "{{ gcp_sdk }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}" IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default(zuul.image_tag) | default('latest') }}" IMAGE_TAG: "{{ image_tag | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}" LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}" NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "false" PUSH_IMAGE: "false"

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

@ -32,6 +32,10 @@
pip: pip:
name: docker name: docker
executable: pip3 executable: pip3
- name: Execute custom role
include_role:
name: "{{ pre_build_role }}"
when: pre_build_role is defined
- name: Publish images - name: Publish images
block: block:
- docker_login: - docker_login:
@ -47,7 +51,7 @@
DOCKER_REGISTRY: "{{ docker_registry }}" DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}" GCP_SDK: "{{ gcp_sdk }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}" IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default(zuul.image_tag) | default('latest') }}" IMAGE_TAG: "{{ image_tag | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}" LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}" NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "true" PUSH_IMAGE: "true"