X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2FMakefile;h=b25381fd816886da8f5974f78cf67d3e54839d65;hb=21731c96c5f92dedb9019ca2abbe4686998bba77;hp=3f41c3cc4bae27ca2eba5018f1dd45f399882993;hpb=5e0f340c9a9fb82be83585739093b265946c3b11;p=oom.git

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 3f41c3cc4b..b25381fd81 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -20,11 +20,17 @@ OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
 
+ifneq ($(SKIP_LINT),TRUE)
+	HELM_LINT_CMD := helm lint
+else
+	HELM_LINT_CMD := echo "Skipping linting of"
+endif
+
 SUBMODS := robot aai
 EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
 
-.PHONY: $(EXCLUDES) $(HELM_CHARTS) $(SUBMODS)
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
 
 all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) plugins
 
@@ -55,7 +61,7 @@ dep-%: make-%
 	@if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
 
 lint-%: dep-%
-	@if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+	@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
 
 package-%: lint-%
 	@mkdir -p $(PACKAGE_DIR)
@@ -75,6 +81,7 @@ plugins:
 repo:
 	@mkdir -p $(PACKAGE_DIR)
 	@helm serve --repo-path $(PACKAGE_DIR) &
+	@sleep 3
 	@helm repo index $(PACKAGE_DIR)
 	@helm repo add local http://127.0.0.1:8879