X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-f-release.sh;h=42e3e544451425b2b7cbb1a902ac991086953680;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=85f4764dc4371c1d548189f362abf594a26b32d3;hpb=8fbc63697f2edaaf2c9db40f54b318e7211361e2;p=nonrtric.git diff --git a/test/common/test_env-oran-f-release.sh b/test/common/test_env-oran-f-release.sh index 85f4764d..42e3e544 100755 --- a/test/common/test_env-oran-f-release.sh +++ b/test/common/test_env-oran-f-release.sh @@ -60,17 +60,17 @@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_REPO # A1PMS base image and tags A1PMS_IMAGE_BASE="o-ran-sc/nonrtric-plt-a1policymanagementservice" -A1PMS_IMAGE_TAG_LOCAL="2.4.0-SNAPSHOT" -A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.0-SNAPSHOT" -A1PMS_IMAGE_TAG_REMOTE="2.4.0" -A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.4.0" +A1PMS_IMAGE_TAG_LOCAL="2.4.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.1-SNAPSHOT" +A1PMS_IMAGE_TAG_REMOTE="2.4.1" +A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.4.1" # ICS image and tags ICS_IMAGE_BASE="o-ran-sc/nonrtric-plt-informationcoordinatorservice" -ICS_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT" -ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT" -ICS_IMAGE_TAG_REMOTE="1.3.0" -ICS_IMAGE_TAG_REMOTE_RELEASE="1.3.0" +ICS_IMAGE_TAG_LOCAL="1.3.2-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.2-SNAPSHOT" +ICS_IMAGE_TAG_REMOTE="1.3.2" +ICS_IMAGE_TAG_REMOTE_RELEASE="1.3.1" #Note: Update var ICS_FEATURE_LEVEL if image version is changed #Control Panel image and tags @@ -89,9 +89,9 @@ NRT_GATEWAY_IMAGE_TAG_REMOTE="1.1.0" NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.0.0" -# SDNC A1 Controller image and tags - Note using released honolulu ONAP image +# SDNC A1 Controller image and tags - Note using released ONAP image SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.1.6" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.2.5" #No local image for ONAP SDNC, remote release image always used # ORAN SDNC adapter kept as reference @@ -125,9 +125,9 @@ RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0" # Near RT RIC Simulator image and tags - same version as cherry RIC_SIM_IMAGE_BASE="o-ran-sc/a1-simulator" RIC_SIM_IMAGE_TAG_LOCAL="latest" -RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT" -RIC_SIM_IMAGE_TAG_REMOTE="2.3.0" -RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.3.0" +RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.2-SNAPSHOT" +RIC_SIM_IMAGE_TAG_REMOTE="2.3.2" +RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.3.1" # DMAAP Mediator Service DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapmediatorproducer" @@ -138,10 +138,10 @@ DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.1.0" # DMAAP Adapter Service DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapadapter" -DMAAP_ADP_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT" -DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT" -DMAAP_ADP_IMAGE_TAG_REMOTE="1.1.0" -DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.1.0" +DMAAP_ADP_IMAGE_TAG_LOCAL="1.1.1-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.1-SNAPSHOT" +DMAAP_ADP_IMAGE_TAG_REMOTE="1.1.1" +DMAAP_ADP_IMAGE_TAG_REMOTE_RELEASE="1.1.1" # Helm Manager HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-plt-helmmanager" @@ -278,7 +278,7 @@ A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container f 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="NOCONSUL INITIALCONFIGMAP" # Space separated list of features +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 @@ -298,7 +298,7 @@ ICS_COMPOSE_DIR="ics" # Dir in simulator_grou ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration ICS_CONFIG_FILE=application.yaml # Config file name ICS_VERSION="V1-2" # Version where the types are decoupled from the producer registration -ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1" # Space separated list of features +ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1 DEFAULT_TYPE_VALIDATION" # Space separated list of features MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR MR_STUB_APP_NAME="mr-stub" # Name of the MR stub @@ -367,24 +367,6 @@ 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" -# SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container) -# SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container) -# SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container) -# SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container) -# SDNC_DB_APP_NAME="sdncdb" # Name of the SDNC DB container -# SDNC_A1_TRUSTSTORE_PASSWORD="" # SDNC truststore password -# SDNC_USER="admin" # SDNC username -# SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD -# SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API -# SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check) -# SDNC_COMPOSE_DIR="sdnc" # Dir in simulator_group for docker-compose -# SDNC_COMPOSE_FILE="docker-compose.yml" -# SDNC_KUBE_APP_FILE="app.yaml" -# SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log -# SDNC_RESPONSE_JSON_KEY="output" # Key name for output json in replies from sdnc # For ONAP sdnc SDNC_APP_NAME="a1controller" # Name of the SNDC A1 Controller container @@ -507,6 +489,7 @@ DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adapter-service/data" # Path in contai 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=application1.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 @@ -522,7 +505,7 @@ DMAAP_MED_DATA_MOUNT_PATH="/configs" # Path in container for DMAAP_MED_HOST_DATA_FILE="type_config_1.json" # Host data file name DMAAP_MED_CONTR_DATA_FILE="type_config.json" # Container data file name DMAAP_MED_FEATURE_LEVEL="KAFKATYPES" # Space separated list of features - + # KAFKATYPES support for kafka type from rel f KAFKAPC_APP_NAME="kafka-procon" # Name for the Kafka procon KAFKAPC_DISPLAY_NAME="Kafka Producer/Consumer" KAFKAPC_EXTERNAL_PORT=8096 # Kafka procon container external port (host -> container)