ONAP is built using plain makefile rules. List of targets is generated
using wildcard function. Based on make changelog:
http://git.savannah.gnu.org/cgit/make.git/tree/NEWS
since version 3.82 wildcard is not going to sort its results which
means that charts are being processed in an arbitrary order which may
lead to build failure due to missing dependencies.
Since version 4.3 make started sorting the wildcard results once again
which may lead to build issues.
To avoid that and make our builds predictible independently from
Makefile version let's make sure that we always sort wildcard results.
Addinally let's use 'file://' instead of '@local' for charts in common
to resolve dependencies between them.
Issue-ID: OOM-2399
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Iacb02dcdbd577ce0e9ca1078dd0586d296ec9375
(cherry picked from commit
aae2da91becf5f1f56329d49656c1ad634917cba)
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 */.)))) $(SUBMODS) $(PARENT_CHART)
-.PHONY: $(EXCLUDES) $(HELM_CHARTS) $(SUBMODS)
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) plugins
COMMON_CHARTS_DIR := common
EXCLUDES :=
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
- @:
\ No newline at end of file
+ @:
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://../../../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://../../../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://../../../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: master
version: ~6.x-0
repository: 'file://components/master'
version: ~6.x-0
repository: 'file://components/curator'
condition: elasticsearch.curator.enabled,curator.enabled
-
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://../../../common'
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
dependencies:\r
- name: common\r
version: ~6.x-0\r
- repository: '@local'\r
+ repository: 'file://../common'\r
- name: mariadb-galera\r
version: ~6.x-0\r
- repository: '@local'\r
+ repository: 'file://../mariadb-galera'\r
condition: global.mariadbGalera.localCluster\r
- name: mariadb-init\r
version: ~6.x-0\r
- repository: '@local'\r
+ repository: 'file://../mariadb-init'\r
condition: not global.mariadbGalera.localCluster\r
dependencies:
- name: common
version: ~6.x-0
- repository: '@local'
+ repository: 'file://../common'
PACKAGE_DIR := $(OUTPUT_DIR)/packages
SECRET_DIR := $(OUTPUT_DIR)/secrets
-EXCLUDES :=
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
+EXCLUDES := dist resources templates charts
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
- @:
\ No newline at end of file
+ @:
--- /dev/null
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# FIXME OOM-765
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+ @helm repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
Code Review / oom.git / commitdiff