airship/images
Code Issues Proposed changes

Allow GCP SDK and AZURE SDK image customization

Browse Source 
Modify airship-images-publish playbook and makefiles to add
GCP_SDK and AZ_SDK variable to run the post job on internal
zuul setup

Change-Id: I516e71999330754dce6915c1da954492cb5a8f12
This commit is contained in:
Dinesh Garg 2020-12-09 10:25:25 +00:00
parent f3ff01ae94
commit 028fc00390
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -13,6 +13,8 @@
- project: - project:
vars: vars:
docker_registry: quay.io docker_registry: quay.io
gcp_sdk: gcr.io/google.com/cloudsdktool/cloud-sdk:308.0.0
az_sdk: mcr.microsoft.com/azure-cli:2.8.0
proxy: proxy:
enabled: false enabled: false
http: "" http: ""

3
bootstrap_capg/Makefile
View File

@ -19,6 +19,7 @@ DOCKER_TARGET_STAGE ?= release
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
GCP_SDK ?= gcr.io/google.com/cloudsdktool/cloud-sdk:308.0.0
PATH += :/usr/local/go/bin PATH += :/usr/local/go/bin
HELP_FILE ?= /tmp/help.txt HELP_FILE ?= /tmp/help.txt
@ -37,6 +38,7 @@ images: Dockerfile \
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
@docker build . --network=host \ @docker build . --network=host \
--build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \
--build-arg GCP_SDK=$(GCP_SDK) \
--tag $(DOCKER_IMAGE) \ --tag $(DOCKER_IMAGE) \
--build-arg http_proxy=$(PROXY) \ --build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \
@ -48,6 +50,7 @@ ifeq ($(USE_PROXY), true)
else else
@docker build . --network=host \ @docker build . --network=host \
--build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \
--build-arg GCP_SDK=$(GCP_SDK) \
--tag $(DOCKER_IMAGE) \ --tag $(DOCKER_IMAGE) \
--force-rm=$(DOCKER_FORCE_CLEAN) --force-rm=$(DOCKER_FORCE_CLEAN)
endif endif

3
bootstrap_capz/Makefile
View File

@ -19,6 +19,7 @@ DOCKER_TARGET_STAGE ?= release
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
AZ_SDK ?= mcr.microsoft.com/azure-cli:2.8.0
PATH += :/usr/local/go/bin PATH += :/usr/local/go/bin
HELP_FILE ?= /tmp/help.txt HELP_FILE ?= /tmp/help.txt
@ -37,6 +38,7 @@ images: Dockerfile \
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
@docker build . --network=host \ @docker build . --network=host \
--build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \
--build-arg AZ_SDK=$(AZ_SDK) \
--tag $(DOCKER_IMAGE) \ --tag $(DOCKER_IMAGE) \
--build-arg http_proxy=$(PROXY) \ --build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \
@ -48,6 +50,7 @@ ifeq ($(USE_PROXY), true)
else else
@docker build . --network=host \ @docker build . --network=host \
--build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \ --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \
--build-arg AZ_SDK=$(AZ_SDK) \
--tag $(DOCKER_IMAGE) \ --tag $(DOCKER_IMAGE) \
--force-rm=$(DOCKER_FORCE_CLEAN) --force-rm=$(DOCKER_FORCE_CLEAN)
endif endif

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

@ -41,4 +41,6 @@
NO_PROXY: "{{ proxy.noproxy }}" NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}" USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ docker_registry }}" DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}"
AZ_SDK: "{{ az_sdk }}"
become: True become: True