From fc726aa9c0fe1cfbab4da137108101b3cb7f8ef6 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Sat, 24 Oct 2020 20:01:18 -0500 Subject: [PATCH] chore(make): updates Makefile This patch set updates the Makefile to use a helm variable so it has parity with OpenStack-Helm-Infra repository. Change-Id: I6cdd599320103349d2fd2486670859a6ef970886 Signed-off-by: Tin Lam --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f576929479..669553733b 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ # It's necessary to set this because some environments don't link sh -> bash. SHELL := /bin/bash +HELM := helm TASK := build EXCLUDES := helm-toolkit doc tests tools logs tmp zuul.d releasenotes @@ -30,13 +31,13 @@ $(CHARTS): init-%: if [ -f $*/Makefile ]; then make -C $*; fi - if [ -f $*/requirements.yaml ]; then helm dep up $*; fi + if [ -f $*/requirements.yaml ]; then $(HELM) dep up $*; fi lint-%: init-% - if [ -d $* ]; then helm lint $*; fi + if [ -d $* ]; then $(HELM) lint $*; fi build-%: lint-% - if [ -d $* ]; then helm package $*; fi + if [ -d $* ]; then $(HELM) package $*; fi # This is used exclusively with helm3 building in the gate to publish package-%: init-%