X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftest_env-oran-g-release.sh;h=0f543a77ba4e765c9e3f4774d35488918e2b0601;hb=2479d8eeffbf064eaa3e11138c80d2368b386157;hp=9b24d267a87d2b24055781d79dc673a9d173e37a;hpb=f81090f8f5f1fd1a76bb9feab1f41f03252297c3;p=nonrtric.git

diff --git a/test/common/test_env-oran-g-release.sh b/test/common/test_env-oran-g-release.sh
index 9b24d267..0f543a77 100755
--- a/test/common/test_env-oran-g-release.sh
+++ b/test/common/test_env-oran-g-release.sh
@@ -17,7 +17,7 @@
 #  ============LICENSE_END=================================================
 #
 #Profile for ORAN Cherry
-TEST_ENV_PROFILE="ORAN-F-RELEASE"
+TEST_ENV_PROFILE="ORAN-G-RELEASE"
 FLAVOUR="ORAN"
 
 ########################################
@@ -75,10 +75,10 @@ ICS_IMAGE_TAG_REMOTE_RELEASE="1.4.0"
 
 #Control Panel image and tags
 CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_IMAGE_TAG_LOCAL="2.3.0-SNAPSHOT"
-CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.3.0-SNAPSHOT"
-CONTROL_PANEL_IMAGE_TAG_REMOTE="2.3.0"
-CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.3.0"
+CONTROL_PANEL_IMAGE_TAG_LOCAL="2.4.0-SNAPSHOT"
+CONTROL_PANEL_IMAGE_TAG_REMOTE_SNAPSHOT="2.4.0-SNAPSHOT"
+CONTROL_PANEL_IMAGE_TAG_REMOTE="2.4.0"
+CONTROL_PANEL_IMAGE_TAG_REMOTE_RELEASE="2.4.0"
 
 
 # Gateway image and tags
@@ -91,7 +91,7 @@ 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_BASE="onap/sdnc-image"
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.2.5"
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.3.2"
 #No local image for ONAP SDNC, remote release image always used
 
 # ORAN SDNC adapter kept as reference
@@ -119,7 +119,7 @@ RAPP_CAT_IMAGE_BASE="o-ran-sc/nonrtric-plt-rappcatalogue"
 RAPP_CAT_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT"
 RAPP_CAT_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT"
 RAPP_CAT_IMAGE_TAG_REMOTE="1.2.0"
-RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
+RAPP_CAT_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
 
 
 # Near RT RIC Simulator image and tags - same version as cherry
@@ -134,7 +134,7 @@ DMAAP_MED_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapmediatorproducer"
 DMAAP_MED_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT"
 DMAAP_MED_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT"
 DMAAP_MED_IMAGE_TAG_REMOTE="1.2.0"
-DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
+DMAAP_MED_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
 
 # DMAAP Adapter Service
 DMAAP_ADP_IMAGE_BASE="o-ran-sc/nonrtric-plt-dmaapadapter"
@@ -148,14 +148,14 @@ HELM_MANAGER_IMAGE_BASE="o-ran-sc/nonrtric-plt-helmmanager"
 HELM_MANAGER_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT"
 HELM_MANAGER_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT"
 HELM_MANAGER_IMAGE_TAG_REMOTE="1.3.0"
-HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.3.0"
+HELM_MANAGER_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
 
 # Auth sidecar
 AUTHSIDECAR_IMAGE_BASE="o-ran-sc/nonrtric-auth-token-fetch"
 AUTHSIDECAR_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
 AUTHSIDECAR_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
 AUTHSIDECAR_IMAGE_TAG_REMOTE="1.1.0"
-AUTHSIDECAR_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
+AUTHSIDECAR_IMAGE_TAG_REMOTE_RELEASE="1.0.0"
 
 #MR stub image and tag
 MRSTUB_IMAGE_BASE="mrstub"
@@ -506,8 +506,8 @@ DMAAP_ADP_CONFIG_MOUNT_PATH="/opt/app/dmaap-adapter-service/config" # Internal c
 DMAAP_ADP_DATA_MOUNT_PATH="/opt/app/dmaap-adapter-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=application1.yaml         # Template config file name
-DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME"            # Space separated list of features
+DMAAP_ADP_CONFIG_FILE_TEMPLATE=application2.yaml         # Template config file name
+DMAAP_ADP_FEATURE_LEVEL="GENERATED_PROD_NAME FILTERSPEC"            # 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,7 +523,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)