summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2018-03-29 16:32:45 -0500
committerScott Hussey <sh8121@att.com>2018-03-29 16:32:45 -0500
commit4f141f2c22b65819f79a10bfa47d3cd07b29f8cd (patch)
treee35119871b0e2752015afc4b0689da768ae16ee8
parentf1fbfa1d5ebd9491ed62c8b912c44aec3d163bae (diff)
[Fix] Makefile default target failed
- Fix the default target Change-Id: I2d3d19f8cce0ca1b729ff74d34a05a412dabb6bc
-rw-r--r--Makefile6
-rwxr-xr-xtools/helm_tk.sh3
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 089a50c..e4181b9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@ HELM := helm
16TASK := build 16TASK := build
17 17
18EXCLUDES := helm-toolkit docs tests tools logs 18EXCLUDES := helm-toolkit docs tests tools logs
19CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) 19CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
20CHART := divingbell 20CHART := divingbell
21 21
22all: $(CHARTS) 22all: $(CHART)
23 23
24$(CHARTS): 24$(CHART):
25 @echo 25 @echo
26 @echo "===== Processing [$@] chart =====" 26 @echo "===== Processing [$@] chart ====="
27 @make $(TASK)-$@ 27 @make $(TASK)-$@
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 9ed74a0..6eabfc6 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -56,8 +56,9 @@ git clone --depth 1 $HTK_REPO || true
56pushd openstack-helm/$HTK_PATH 56pushd openstack-helm/$HTK_PATH
57 57
58git pull 58git pull
59helm_serve
60make helm-toolkit 59make helm-toolkit
60helm_serve
61
61popd && popd 62popd && popd
62for c in $DEP_UP_LIST 63for c in $DEP_UP_LIST
63do 64do