Skip to content

Commit

Permalink
Add 1.3.0 branch (#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
woojoong88 authored Oct 30, 2021
1 parent e5b9c63 commit d281418
Show file tree
Hide file tree
Showing 5 changed files with 853 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ else ifeq ($(VER), v1.2.0)
@echo "Helm values.yaml file: $(HELM_VALUES_V1.2.0)"
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.2.0)
@cd $(AETHERCHARTDIR); git checkout $(AETHERCHARTCID-V1.0.0)
else ifeq ($(VER), v1.3.0)
$(eval VER=v1.3.0)
$(eval HELM_VALUES=$(HELM_VALUES_V1.3.0))
@echo "Helm values.yaml file: $(HELM_VALUES_V1.3.0)"
@cd $(AETHERCHARTDIR); git checkout $(AETHERCHARTCID-V1.3.0)
ifeq ($(OPT), oai)
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-E2AP101-V1.3.0)
else ifeq ($(OPT), ric-e2ap101)
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-E2AP101-V1.3.0)
else
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.3.0)
endif
else ifeq ($(VER), stable)
$(eval VER=stable)
$(eval HELM_VALUES=$(HELM_VALUES_STABLE))
Expand Down
5 changes: 4 additions & 1 deletion MakefileVar.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RESOURCEDIR ?= $(RIABDIR)/resources

# Commit IDs
AETHERCHARTCID-V1.0.0 ?= 6b3a267e428402d6bb8531bd921c1d202bb338b2
AETHERCHARTCID-V1.3.0 ?= 9f79ab87a96ae9ee2bb9a1540f4cd1574261611b
AETHERCHARTCID-LATEST ?= 9f79ab87a96ae9ee2bb9a1540f4cd1574261611b
SDRANCHARTCID-LATEST ?= origin/master
SDRANCHARTCID-E2AP101-LATEST ?= origin/e2ap101
Expand All @@ -24,6 +25,7 @@ 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 ?= a30fbd674f97212ea77d4db1401dab0544e20905
SDRANCHARTCID-V1.3.0 ?= b2c912e15f1422441eaf934b24a8eedf3df66c53

# Helm arguments
DEFAULT_HELM_ARGS := --set import.ran-simulator.enabled=true --set import.onos-pci.enabled=true
Expand All @@ -43,6 +45,7 @@ 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_V1.3.0 ?= $(RIABDIR)/sdran-in-a-box-values-v1.3.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
Expand All @@ -51,7 +54,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, v1.2.0 stable, latest, and dev
# Versions - v1.0.0, v1.1.0, v1.1.1, v1.2.0, v1.3.0, stable, latest, and dev
DEFAULT_VER := stable
VER ?= $(DEFAULT_VER)

Expand Down
Loading

0 comments on commit d281418

Please sign in to comment.