summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Eagan <sean.eagan@att.com>2019-02-20 22:34:47 +0000
committerSean Eagan <sean.eagan@att.com>2019-02-20 22:34:47 +0000
commit8e32f62bbff6233c9f6590c884fd84cb7e5a87e3 (patch)
treefb7bd437cf1091b9a401043186290c58aedca56b
parent074e36ee43c0da9ba92ca9e6a4d631495f14538e (diff)
Revert "Revert "Use UBUNTU_BASE_IMAGE instead of BASE_IMAGE""
Jenkins has now been updated to pass UBUNTU_BASE_IMAGE to armada [0]. [0]: https://review.gerrithub.io/c/att-comdev/cicd/+/443953 This reverts commit 074e36ee43c0da9ba92ca9e6a4d631495f14538e. Change-Id: I00e57fb64989bd949548a9c9e08ec89762cb8144
Notes
Notes (review): Code-Review+1: Dustin Specker <dustin.specker@att.com> Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Code-Review+1: Dan Crank <dan.no@att.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+1: Michael Beaver <michaelbeaver64@gmail.com> Code-Review+1: Vieri <15050873171@163.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Mar 2019 14:04:16 +0000 Reviewed-on: https://review.openstack.org/638282 Project: openstack/airship-armada Branch: refs/heads/master
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1ff8238..5125c40 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
29PYTHON = python3 29PYTHON = python3
30CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) 30CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
31IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} 31IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
32BASE_IMAGE ?= 32UBUNTU_BASE_IMAGE ?=
33 33
34# VERSION INFO 34# VERSION INFO
35GIT_COMMIT = $(shell git rev-parse HEAD) 35GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -99,7 +99,7 @@ run_images: run_armada
99run_armada: build_armada 99run_armada: build_armada
100 ./tools/armada_image_run.sh $(IMAGE) 100 ./tools/armada_image_run.sh $(IMAGE)
101 101
102_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,) 102_BASE_IMAGE_ARG := $(if $(UBUNTU_BASE_IMAGE),--build-arg FROM="${UBUNTU_BASE_IMAGE}" ,)
103 103
104.PHONY: build_armada 104.PHONY: build_armada
105build_armada: 105build_armada: