X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Felasticsearch%2Fcomponents%2FMakefile;h=79ba2fb47e42d0cd11a5b286a0513209f6c2c826;hb=refs%2Fheads%2Fmaster;hp=f2e7a1fb8261392eac2eff482c02e1e034ce9598;hpb=1b682fa8b00eea8bb43d2f462bfeda686c74e7cd;p=oom.git diff --git a/kubernetes/common/elasticsearch/components/Makefile b/kubernetes/common/elasticsearch/components/Makefile index f2e7a1fb82..79ba2fb47e 100644 --- a/kubernetes/common/elasticsearch/components/Makefile +++ b/kubernetes/common/elasticsearch/components/Makefile @@ -17,9 +17,15 @@ OUTPUT_DIR := $(ROOT_DIR)/../../dist PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets -EXCLUDES := soHelpers +EXCLUDES := HELM_BIN := helm -HELM_CHARTS := soHelpers $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) +ifneq ($(SKIP_LINT),TRUE) + HELM_LINT_CMD := $(HELM_BIN) lint +else + HELM_LINT_CMD := echo "Skipping linting of" +endif + +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -33,18 +39,19 @@ make-%: @if [ -f $*/Makefile ]; then make -C $*; fi dep-%: make-% - @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi lint-%: dep-% - @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi + @if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi - @$(HELM_BIN) repo index $(PACKAGE_DIR) + @sleep 3 + #@$(HELM_BIN) repo index $(PACKAGE_DIR) clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @rm -f *tgz */charts/*tgz @rm -rf $(PACKAGE_DIR) %: