X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-e-release.sh;h=e534531211e7545eff66e8900ae45ad73c2bc3e0;hb=23d69b4a0fac41be58676c006867332c9fac6071;hp=65dd0afc4c53023e29917d96b54ebd417e4dd4ac;hpb=0ade79498db21c8db3ecdd96ec30eb006e593acb;p=nonrtric.git diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index 65dd0afc..e5345312 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -41,7 +41,7 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # NOTE: One environment variable containing the image name and tag is create by the test script # for each image from the env variables below. # The variable is created by removing the suffix "_BASE" from the base image variable name. -# Example: POLICY_AGENT_IMAGE_BASE -> POLICY_AGENT_IMAGE +# Example: A1PMS_IMAGE_BASE -> A1PMS_IMAGE # This var will point to the local or remote image depending on cmd line arguments. # In addition, the repo and the image tag version are selected from the list of image tags based on the cmd line argurment. # For images built by the script, only tag #1 shall be specified @@ -58,19 +58,19 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # 7 XXX_PROXY: other images, not produced by the project: : -# Policy Agent base image and tags -POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent" -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" -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.3.0" +# A1PMS base image and tags +A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-a1-policy-management-service" +A1PMS_IMAGE_TAG_LOCAL="2.3.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="2.3.1" +A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.3.1" # ICS image and tags ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service" -ICS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT" -ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT" -ICS_IMAGE_TAG_REMOTE="1.2.0" -ICS_IMAGE_TAG_REMOTE_RELEASE="1.2.0" +ICS_IMAGE_TAG_LOCAL="1.2.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.1-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.2.1" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.2.1" #Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags @@ -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.2-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.2-SNAPSHOT" +RAPP_CAT_IMAGE_TAG_REMOTE="1.0.2" +RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.0.2" # Near RT RIC Simulator image and tags - same version as cherry @@ -131,17 +131,24 @@ RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.2.0" # DMAAP Mediator Service DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-mediator-producer" -DMAAP_MED_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" -DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.0-SNAPSHOT" -DMAAP_MED_IMAGE_TAG_REMOTE="1.0.0" -DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.0.0" +DMAAP_MED_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +DMAAP_MED_IMAGE_TAG_REMOTE="1.0.1" +DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.0.1" # DMAAP Adapter Service DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-dmaap-adaptor" -DMAAP_ADP_IMAGE_TAG_LOCAL="1.0.0-SNAPSHOT" -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" +DMAAP_ADP_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE="1.0.1" +DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.0.1" + +# Helm Manager +HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-helm-manager" +HELM_MANAGER_IMAGE_TAG_LOCAL="1.1.1-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.1-SNAPSHOT" +HELM_MANAGER_IMAGE_TAG_REMOTE="1.1.1" +HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.1.1" #Consul remote image and tag CONSUL_IMAGE_BASE="consul" @@ -207,8 +214,13 @@ KAFKAPC_IMAGE_BASE="kafka-procon" KAFKAPC_IMAGE_TAG_LOCAL="latest" #No local image for pvc cleaner, remote image always used +#Chartmusem 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="A1PMS 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 @@ -242,29 +254,30 @@ KUBE_A1SIM_NAMESPACE="a1-sim" # Namespace for a1-p si KUBE_ONAP_NAMESPACE="onap" # Namespace for onap (only message router) KUBE_SDNC_NAMESPACE="onap" # Namespace for sdnc -POLICY_AGENT_EXTERNAL_PORT=8081 # Policy Agent container external port (host -> container) -POLICY_AGENT_INTERNAL_PORT=8081 # Policy Agent container internal port (container -> container) -POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent container external secure port (host -> container) -POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container) -POLICY_AGENT_APIS="V1 V2" # Supported northbound api versions -PMS_VERSION="V2" # Tested version of northbound API -PMS_API_PREFIX="/a1-policy" # api url prefix, only for V2 - -POLICY_AGENT_APP_NAME="policymanagementservice" # Name for Policy Agent container -POLICY_AGENT_DISPLAY_NAME="Policy Management Service" -POLICY_AGENT_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host -POLICY_AGENT_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the Policy Agent container -POLICY_AGENT_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel -POLICY_AGENT_CONFIG_KEY="policy-agent" # Key for consul config -POLICY_AGENT_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice" # Java base package name -POLICY_AGENT_ACTUATOR="/actuator/loggers/$POLICY_AGENT_PKG_NAME" # Url for trace/debug -POLICY_AGENT_ALIVE_URL="$PMS_API_PREFIX/v2/status" # Base path for alive check -POLICY_AGENT_COMPOSE_DIR="policy_agent" # Dir in simulator_group for docker-compose -POLICY_AGENT_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config" # Path in container for config file -POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file -POLICY_AGENT_CONFIG_FILE="application.yaml" # Container config file name -POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name -POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container +A1PMS_EXTERNAL_PORT=8081 # A1PMS container external port (host -> container) +A1PMS_INTERNAL_PORT=8081 # A1PMS container internal port (container -> container) +A1PMS_EXTERNAL_SECURE_PORT=8433 # A1PMS container external secure port (host -> container) +A1PMS_INTERNAL_SECURE_PORT=8433 # A1PMS container internal secure port (container -> container) +A1PMS_APIS="V1 V2" # Supported northbound api versions +A1PMS_VERSION="V2" # Tested version of northbound API +A1PMS_API_PREFIX="/a1-policy" # api url prefix, only for V2 + +A1PMS_APP_NAME="policymanagementservice" # Name for A1PMS container +A1PMS_DISPLAY_NAME="Policy Management Service" +A1PMS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host +A1PMS_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the A1PMS container +A1PMS_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel +A1PMS_CONFIG_KEY="policy-agent" # Key for consul config +A1PMS_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice" # Java base package name +A1PMS_ACTUATOR="/actuator/loggers/$A1PMS_PKG_NAME" # Url for trace/debug +A1PMS_ALIVE_URL="$A1PMS_API_PREFIX/v2/status" # Base path for alive check +A1PMS_COMPOSE_DIR="a1pms" # Dir in simulator_group for docker-compose +A1PMS_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config" # Path in container for config file +A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file +A1PMS_CONFIG_FILE="application.yaml" # Container config file name +A1PMS_DATA_FILE="application_configuration.json" # Container data file name +A1PMS_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container +A1PMS_FEATURE_LEVEL="" # Space separated list of features ICS_APP_NAME="informationservice" # Name for ICS container ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container @@ -277,7 +290,7 @@ ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path th ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container -ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug +ICS_ACTUATOR="/actuator/loggers/org.oransc.ics" # Url for trace/debug ICS_CERT_MOUNT_DIR="./cert" ICS_ALIVE_URL="/status" # Base path for alive check ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose @@ -510,6 +523,8 @@ DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adaptor-service/config" # Internal c DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adaptor-service/data" # Path in container for data file DMAAP_ADP_DATA_FILE="application_configuration.json" # Container data file name DMAAP_ADP_CONFIG_FILE=application.yaml # Config file name +DMAAP_ADP_CONFIG_FILE_TEMPLATE=application.yaml # Template config file name +DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME" # Space separated list of features DMAAP_MED_APP_NAME="dmaapmediatorservice" # Name for Dmaap Mediator container DMAAP_MED_DISPLAY_NAME="Dmaap Mediator Service" # Display name for Dmaap Mediator container @@ -523,14 +538,16 @@ DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relati #MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container #DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug #DMAAP_MED_CERT_MOUNT_DIR="./cert" -DMAAP_MED_ALIVE_URL="/status" # Base path for alive check +DMAAP_MED_ALIVE_URL="/health_check" # Base path for alive check DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose #MAAP_MED_CONFIG_MOUNT_PATH="/app" # Internal container path for configuration DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for data file -DMAAP_MED_DATA_FILE="type_config.json" # Container data file name +DMAAP_MED_HOST_DATA_FILE="type_config.json" # Host data file name +DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name +DMAAP_MED_FEATURE_LEVEL="" # Space separated list of features KAFKAPC_APP_NAME="kafka-procon" # Name for the Kafka procon -KAFKAPC_DISPLAY_NAME="Kafaka Producer/Consumer" +KAFKAPC_DISPLAY_NAME="Kafka Producer/Consumer" KAFKAPC_EXTERNAL_PORT=8096 # Kafka procon container external port (host -> container) KAFKAPC_INTERNAL_PORT=8090 # Kafka procon container internal port (container -> container) KAFKAPC_EXTERNAL_SECURE_PORT=8097 # Kafka procon container external secure port (host -> container) @@ -538,6 +555,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 ########################################