Add 1.2.0 version target (#107)

onosproject · Jul 24, 2021 · e106e66 · e106e66
1 parent 774a55d
commit e106e66
Show file tree

Hide file tree

Showing 8 changed files with 698 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -105,6 +105,11 @@ else ifeq ($(VER), v1.1.1)
 	$(eval HELM_VALUES=$(HELM_VALUES_V1.1.1))
 	@echo "Helm values.yaml file: $(HELM_VALUES_V1.1.1)"
 	@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.1.1)
+else ifeq ($(VER), v1.2.0)
+	$(eval VER=v1.2.0)
+	$(eval HELM_VALUES=$(HELM_VALUES_V1.2.0))
+	@echo "Helm values.yaml file: $(HELM_VALUES_V1.2.0)"
+	@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.2.0)
 else ifeq ($(VER), stable)
 	$(eval VER=stable)
 	$(eval HELM_VALUES=$(HELM_VALUES_STABLE))

diff --git a/MakefileVar.mk b/MakefileVar.mk
@@ -20,6 +20,7 @@ SDRANCHARTCID-LATEST		?= origin/master
 SDRANCHARTCID-V1.0.0		?= v1.0.0 #branch: v1.0.0
 SDRANCHARTCID-V1.1.0		?= 6670e6da25129b665b024a7c6d0fd79cfda52f25
 SDRANCHARTCID-V1.1.1		?= 479ff0b59d4ae9f09cd9f7be6ea9a189f207b810
+SDRANCHARTCID-V1.2.0		?= e98e5c2b20bde69b9b9d1ec4b3166c2aeab589da
 
 #  Helm arguments
 DEFAULT_HELM_ARGS			:= --set import.ran-simulator.enabled=true --set import.onos-pci.enabled=true
@@ -36,6 +37,7 @@ HELM_VALUES					?= $(DEFAULT_HELM_VALUES)
 HELM_VALUES_V1.0.0			?= $(RIABDIR)/sdran-in-a-box-values-v1.0.0.yaml
 HELM_VALUES_V1.1.0			?= $(RIABDIR)/sdran-in-a-box-values-v1.1.0.yaml
 HELM_VALUES_V1.1.1			?= $(RIABDIR)/sdran-in-a-box-values-v1.1.1.yaml
+HELM_VALUES_V1.2.0			?= $(RIABDIR)/sdran-in-a-box-values-v1.2.0.yaml
 HELM_VALUES_STABLE			?= $(RIABDIR)/sdran-in-a-box-values-master-stable.yaml
 HELM_VALUES_LATEST			?= $(RIABDIR)/sdran-in-a-box-values.yaml
 HELM_VALUES_DEV				?= $(RIABDIR)/sdran-in-a-box-values.yaml
@@ -44,7 +46,7 @@ HELM_VALUES_DEV				?= $(RIABDIR)/sdran-in-a-box-values.yaml
 DEFAULT_OPT					:= ransim
 OPT							?= $(DEFAULT_OPT)
 
-# Versions - v1.0.0, v1.1.0, v1.1.1, stable, latest, and dev
+# Versions - v1.0.0, v1.1.0, v1.1.1, v1.2.0 stable, latest, and dev
 DEFAULT_VER					:= stable
 VER							?= $(DEFAULT_VER)
 

diff --git a/configs/chart_values/onf-server-1-riab-master-stable.yaml b/configs/chart_values/onf-server-1-riab-master-stable.yaml
@@ -178,15 +178,6 @@ config:
 #     loggers:
 #       root:
 #         level: info
-# onos-e2sub:
-#   image:
-#     pullPolicy: IfNotPresent
-#     repository: onosproject/onos-e2sub
-#     tag: latest
-#   logging:
-#     loggers:
-#       root:
-#         level: info
 # onos-cli:
 #   image:
 #     pullPolicy: IfNotPresent
@@ -247,17 +238,22 @@ config:
 # fb-ah-xapp:
 #   image:
 #     repository: onosproject/fb-ah-xapp
-#     tag: 0.0.1
+#     tag: 0.0.4
+#     pullPolicy: IfNotPresent
+# fb-kpimon-xapp:
+#   image:
+#     repository: onosproject/fb-kpimon-xapp
+#     tag: 0.0.2
 #     pullPolicy: IfNotPresent
 # fb-ah-gui:
 #   image:
 #     repository: onosproject/fb-ah-gui
-#     tag: 0.0.1
+#     tag: 0.0.2
 #     pullPolicy: IfNotPresent
 # ah-eson-test-server:
 #   image:
 #     repository: onosproject/ah-eson-test-server
-#     tag: 0.0.1
+#     tag: 0.0.2
 #     pullPolicy: IfNotPresent
 
 
@@ -315,10 +311,12 @@ import:
 #     enabled: false
 #   nem-monitoring:
 #     enabled: false
-# fb-ah-xapp, fb-ah-gui, and ah-eson-test-server are automatically imported when pushing fbc-pci option
+# fb-ah-xapp, fb-ah-gui, fb-kpimon-xapp and ah-eson-test-server are automatically imported when pushing fbc-pci option
 #   fb-ah-xapp:
 #     enabled: false
 #   fb-ah-gui:
 #     enabled: false
 #   ah-eson-test-server:
+#     enabled: false
+#   fb-kpimon-xapp:
 #     enabled: false