airship/images
Code Issues Proposed changes

Enable additional makefile values to be overridden

Browse Source 
Change-Id: I10d5b5ab65be4210593d5caaedf28a86ddfac824
This commit is contained in:
Anderson, Craig (ca846m) 2021-02-23 12:31:39 -08:00
parent e4e3b7adfa
commit e3058f546a
5 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

@ -22,6 +22,9 @@
noproxy: ""
makefile_chdir: "{{ zuul.project.src_dir }}"
image_config_dir: config
image_prefix: airshipit
image_label: org.airshipit.build=community
image_tag: latest
check:
jobs:
- airship-images-functional

5
ironic/Makefile
View File

@ -24,7 +24,10 @@ OPENSTACK_VERSION ?= stable/ussuri
DISTRO ?= ubuntu_bionic
OS_VER = $(word 2, $(subst /, ,$(OPENSTACK_VERSION)))
IMAGE_NAME ?= ironic
IMAGE_TAG ?= ${OS_VER}-${DISTRO}
# Maintain support for legacy behavior
ifeq ($(IMAGE_TAG), latest)
IMAGE_TAG := ${OS_VER}-${DISTRO}
endif
IMAGE_IRONIC := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
IMAGE_REQUIREMENTS := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/requirements:${IMAGE_TAG}
IMAGE_LOCI_WHEELS := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/loci_wheels:${IMAGE_TAG}

4
ironic/build-image.sh
View File

@ -21,7 +21,9 @@ set -e
: "${ironic_pip_packages:="pycrypto python-openstackclient sushy"}"
: "${ironic_dist_packages:="ethtool lshw iproute2"}"
# Image tag
IMAGE_TAG="${OPENSTACK_VERSION#*/}-${DISTRO}"
if [ -z "${IMAGE_TAG}" ]; then
IMAGE_TAG="${OPENSTACK_VERSION#*/}-${DISTRO}"
fi
echo "Build Pre-Requirement docker image"
docker build ${base_extra_build_args} \

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

@ -38,14 +38,17 @@
chdir: "{{ makefile_chdir }}"
target: "images"
params:
AZ_SDK: "{{ az_sdk }}"
COMMIT: "{{ zuul.newrev | default('') }}"
PUSH_IMAGE: "false"
PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}"
AZ_SDK: "{{ az_sdk }}"
WORKDIR: "{{ image_config_dir | default('config') }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "false"
PROXY: "{{ proxy.http }}"
QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
WORKDIR: "{{ image_config_dir | default('config') }}"
become: True

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

@ -42,14 +42,17 @@
chdir: "{{ makefile_chdir }}"
target: "images"
params:
AZ_SDK: "{{ az_sdk }}"
COMMIT: "{{ zuul.newrev | default('') }}"
PUSH_IMAGE: "true"
PROXY: "{{ proxy.http }}"
NO_PROXY: "{{ proxy.noproxy }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
DOCKER_REGISTRY: "{{ docker_registry }}"
GCP_SDK: "{{ gcp_sdk }}"
AZ_SDK: "{{ az_sdk }}"
WORKDIR: "{{ image_config_dir | default('config') }}"
IMAGE_PREFIX: "{{ image_prefix | default('airshipit') }}"
IMAGE_TAG: "{{ image_tag | default('latest') }}"
LABEL: "{{ image_label | default('org.airshipit.build=community') }}"
NO_PROXY: "{{ proxy.noproxy }}"
PUSH_IMAGE: "true"
PROXY: "{{ proxy.http }}"
QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}"
USE_PROXY: "{{ proxy.enabled | lower }}"
WORKDIR: "{{ image_config_dir | default('config') }}"
become: True