X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-e-release.sh;h=245dec8c075577907ecac0c24b6d72f6908b749e;hb=4dd321bda70fab4987c1ea7aa0dffc5e1eb74252;hp=044ad2411209f125a011a90decf3c8249c03aad3;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index 044ad241..245dec8c 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -59,7 +59,7 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # Policy Agent base image and tags -POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent" +POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-a1-policy-management-service" POLICY_AGENT_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT" POLICY_AGENT_IMAGE_TAG_REMOTE="2.3.0" @@ -83,10 +83,10 @@ CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.3.0" # Gateway image and tags NRT_GATEWAY_IMAGE_BASE="o-ran-sc/nonrtric-gateway" -NRT_GATEWAY_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -NRT_GATEWAY_IMAGE_TAG_REMOTE="1.1.0" -NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +NRT_GATEWAY_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" +NRT_GATEWAY_IMAGE_TAG_REMOTE="1.0.0" +NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.0.0" # SDNC A1 Controller image and tags - Note using released honolulu ONAP image @@ -116,10 +116,10 @@ SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5" # RAPP Catalogue image and tags RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-r-app-catalogue" -RAPP_CAT_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -RAPP_CAT_IMAGE_TAG_REMOTE="1.1.0" -RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +RAPP_CAT_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE="1.0.1" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.0.1" # Near RT RIC Simulator image and tags - same version as cherry @@ -143,6 +143,13 @@ DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" DMAAP_ADP_IMAGE_TAG_REMOTE="1.0.0" DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.0.0" +# Helm Manager +HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-helm-manager" +HELM_MANAGER_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE="1.1.0" +HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.1.0" + #Consul remote image and tag CONSUL_IMAGE_BASE="consul" CONSUL_IMAGE_TAG_REMOTE_PROXY="1.7.2" @@ -207,8 +214,13 @@ KAFKAPC_IMAGE_BASE="kafka-procon" KAFKAPC_IMAGE_TAG_LOCAL="latest" #No local image for pvc cleaner, remote image always used +#PVC Cleaner remote image and tag +CHART_MUS_IMAGE_BASE="ghcr.io/helm/chartmuseum" +CHART_MUS_IMAGE_TAG_REMOTE_OTHER="v0.13.1" +#No local image for chart museum, remote image always used + # List of app short names produced by the project -PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used +PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED HELMMANAGER" # Add SDNC here if oran image is used # List of app short names which images pulled from ORAN ORAN_IMAGES_APP_NAMES="" # Not used @@ -367,7 +379,7 @@ RIC_SIM_CERT_MOUNT_DIR="./cert" RIC_SIM_COMPOSE_DIR="ric" # Dir in simulator group for docker compose RIC_SIM_ALIVE_URL="/" # Base path for alive check - +RIC_SIM_COMMON_SVC_NAME="" # Name of svc if one common svc is used for all ric sim groups (stateful sets) # Kept as reference for oran a1 adapter # SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container # SDNC_DISPLAY_NAME="SDNC A1 Controller" @@ -538,6 +550,28 @@ KAFKAPC_INTERNAL_SECURE_PORT=8091 # Kafka procon containe KAFKAPC_ALIVE_URL="/" # Base path for alive check KAFKAPC_COMPOSE_DIR="kafka-procon" # Dir in simulator_group for docker-compose KAFKAPC_BUILD_DIR="kafka-procon" # Build dir + +CHART_MUS_APP_NAME="chartmuseum" # Name for the chart museum app +CHART_MUS_DISPLAY_NAME="Chart Museum" +CHART_MUS_EXTERNAL_PORT=8201 # chart museum container external port (host -> container) +CHART_MUS_INTERNAL_PORT=8080 # chart museum container internal port (container -> container) +CHART_MUS_ALIVE_URL="/health" # Base path for alive check +CHART_MUS_COMPOSE_DIR="chartmuseum" # Dir in simulator_group for docker-compose +CHART_MUS_CHART_CONTR_CHARTS="/tmp/charts" # Local dir container for charts + +HELM_MANAGER_APP_NAME="helmmanagerservice" # Name for the helm manager app +HELM_MANAGER_DISPLAY_NAME="Helm Manager" +HELM_MANAGER_EXTERNAL_PORT=8211 # helm manager container external port (host -> container) +HELM_MANAGER_INTERNAL_PORT=8083 # helm manager container internal port (container -> container) +HELM_MANAGER_EXTERNAL_SECURE_PORT=8212 # helm manager container external secure port (host -> container) +HELM_MANAGER_INTERNAL_SECURE_PORT=8443 # helm manager container internal secure port (container -> container) +HELM_MANAGER_CLUSTER_ROLE=cluster-admin # Kubernetes cluster role for helm manager +HELM_MANAGER_SA_NAME=helm-manager-sa # Service account name +HELM_MANAGER_ALIVE_URL="/helm/charts" # Base path for alive check +HELM_MANAGER_COMPOSE_DIR="helmmanager" # Dir in simulator_group for docker-compose +HELM_MANAGER_USER="helmadmin" +HELM_MANAGER_PWD="itisasecret" + ######################################## # Setting for common curl-base function ########################################