x/ranger
Code Issues Proposed changes

Ranger Image Creation Testing

Browse Source 
Attempting to debug problems with
playbook accessing zuul environment
variables being used to tag the patchset.

Change-Id: Idf04944fc41a32c6deebc022dff6566bbe4fc0f3
This commit is contained in:
jh629g
2019-11-15 17:43:05 -06:00
committed by Jeremy Houser
parent 3a9a5a37a7
commit ba4de9646c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -18,13 +18,13 @@ IMAGE_PREFIX ?= attcomdev
IMAGE_TAG ?= latest
HELM ?= helm
LABEL ?= miscellaneous
COMMIT ?= commit-id
COMMIT ?= $(shell git rev-parse HEAD)
PROXY ?= http://foo.proxy.com:8000
PUSH_IMAGE ?= false
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false
RANGER_USER := ranger
GERRIT_BRANCH ?= master
BRANCH ?= master
IMAGE_LATEST := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${LABEL}
@@ -38,8 +38,8 @@ images: $(IMAGE_NAME)
$(IMAGE_NAME):
@echo
@echo "===== Processing [$@] image ====="
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${GERRIT_BRANCH}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${GERRIT_BRANCH}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${BRANCH}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${BRANCH}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@
# Create tgz of the chart
.PHONY: charts

6
tools/zuul/playbooks/docker-image-build.yaml
View File

@@ -57,9 +57,9 @@
- name: Determine tags
environment:
BRANCH: "{{ zuul.branch | default('') }}"
CHANGE: "{{ zuul.change | default('') }}"
COMMIT: "{{ zuul.newrev | default('') }}"
BRANCH: zuul.branch
CHANGE: zuul.change
COMMIT: zuul.newrev
PATCHSET: "{{ zuul.patchset | default('') }}"
shell: echo '{{ tags | to_json }}' | python {{ zuul.project.src_dir }}/tools/image_tags.py
register: image_tags