X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=smo-install%2Foran_oom%2FMakefile;h=617cbe86cf73ee91b4c357a27f8747abed5d3cf6;hb=HEAD;hp=40a4e2408b9c715e9234fb860d6ffc12afe5711c;hpb=a2c2df5014145ee3126146987d9039e397b12407;p=it%2Fdep.git

diff --git a/smo-install/oran_oom/Makefile b/smo-install/oran_oom/Makefile
index 40a4e240..8e106c25 100644
--- a/smo-install/oran_oom/Makefile
+++ b/smo-install/oran_oom/Makefile
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PARENT_CHART := nonrtric ru-du-simulators
+PARENT_CHART := nonrtric
 COMMON_CHARTS_DIR := nonrtric-common aux-common ric-common
 # FIXME OOM-765
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -28,7 +29,7 @@ ifneq "$(findstring v3,$(HELM_VER))" "v3"
 	HELM_VER := $(shell $(HELM_BIN) version -c --template "{{.Client.SemVer}}")
 endif
 
-# use this if you would like to push onap charts to repo with other name
+# use this if you would like to cm-push onap charts to repo with other name
 # WARNING: Helm v3+ only
 # WARNING: Make sure to edit also requirements files
 HELM_REPO := local
@@ -41,7 +42,7 @@ endif
 
 #SUBMODS := robot
 #EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
-EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART)
+EXCLUDES := config oneclick readiness test dist helm policy-clamp-ac-dme-ppnt $(PARENT_CHART)
 HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS) check-for-staging-images
@@ -62,9 +63,9 @@ $(SUBMODS):
 	@make package-$@
 
 submod-%:
-	@make $*/requirements.yaml
+	@make $*/Chart.yaml
 
-%/requirements.yaml:
+%/Chart.yaml:
 	$(error Submodule $* needs to be retrieved from gerrit.  See https://wiki.onap.org/display/DW/OOM+-+Development+workflow+after+code+transfer+to+tech+teams ); fi
 
 print_helm_bin:
@@ -74,7 +75,7 @@ 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_LINT_CMD) $*; fi
@@ -82,14 +83,14 @@ lint-%: dep-%
 package-%: lint-%
 	@mkdir -p $(PACKAGE_DIR)
 ifeq "$(findstring v3,$(HELM_VER))" "v3"
-	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME $(HELM_REPO); fi
+	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi
 else
 	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
 	@$(HELM_BIN) repo index $(PACKAGE_DIR)
 endif
 
 clean:
-	@rm -f */requirements.lock
+	@rm -f */Chart.lock
 	@find . -type f -name '*.tgz' -delete
 	@rm -rf $(PACKAGE_DIR)/*