diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-03-26 12:28:53 -0400 |
|---|---|---|
| committer | Mike Elliott <mike.elliott@amdocs.com> | 2018-03-26 15:11:52 -0400 |
| commit | 003d7290a65a9df52e049b9c824dfb20a2b6d253 (patch) | |
| tree | 747d94ef0b010a73ff85e450d3b64bd4b32aecc1 /kubernetes/Makefile | |
| parent | 114736eb5119b023bc5f166a3b42aaf933b0b223 (diff) | |
Add fix for build dependecies
Moved mysql and dgbuilder under common (built first)
to ensure they are built before appc and sdnc charts
that depend on them.
Change-Id: I2fc28f0537b2639bd2b761c6f115544965a228b1
Issue-ID: OOM-830
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Diffstat (limited to 'kubernetes/Makefile')
| -rw-r--r-- | kubernetes/Makefile | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile index 9cbf90fba7..f3e50e4347 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -1,26 +1,33 @@ +# 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. + PARENT_CHART := onap COMMON_CHARTS_DIR := common -SETUP_CHARTS_DIR := setup -#Order is important -SHARED_CHARTS := common setup mysql dgbuilder # 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 := $(COMMON_CHARTS_DIR) config oneclick readiness test dist helm $(PARENT_CHART) dcae -EXCLUDES := $(SHARED_CHARTS) config oneclick readiness test dist $(PARENT_CHART) dcae +EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART) .PHONY: $(EXCLUDES) $(HELM_CHARTS) all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS) -common: -all: $(SHARED_CHARTS) $(HELM_CHARTS) - -$(SHARED_CHARTS): +$(COMMON_CHARTS): @echo "\n[$@]" @make package-$@ |