From 03335fb4f63eaefeaa0eb334857efb73b651e01b Mon Sep 17 00:00:00 2001 From: jh629g Date: Thu, 21 Nov 2019 15:27:08 -0600 Subject: [PATCH] Makefile Fixes error in tagging, attempting to fix Change-Id: Idd2539f14c80910ee8f3064e16543ae98c29f3a5 --- Makefile | 3 +-- tools/zuul/playbooks/docker-image-build.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c49a0805..3bf75dee 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,8 @@ IMAGE_DIR:=images/$(IMAGE_NAME) .PHONY: images images: $(IMAGE_NAME) $(IMAGE_NAME): - @echo "===== =====" + @echo " " @echo "===== Processing [$@] image =====" - @echo "===== =====" @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@ # Create tgz of the chart diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml index 49e02bd2..8c9794ef 100644 --- a/tools/zuul/playbooks/docker-image-build.yaml +++ b/tools/zuul/playbooks/docker-image-build.yaml @@ -75,7 +75,6 @@ params: BRANCH: "{{ zuul.branch | default('') }}" CHANGE: "{{ zuul.change | default('') }}" - COMMIT: "{{ zuul.newrev | default('') }}" PATCHSET: "{{ zuul.patchset | default('') }}" LABEL: "org.label-schema.vcs-ref={{ zuul.patchset | default('') }} --label org.label-schema.vcs-url={{ zuul.change | default('') }} --label org.label-schema.version=0.1.0 --label org.label-schema.branch={{ zuul.branch | default('') }}" DOCKER_REGISTRY: "quay.io"