From: BjornMagnussonXA Date: Fri, 8 Oct 2021 06:58:12 +0000 (+0200) Subject: Test env updates X-Git-Tag: 1.2.0~74^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F6848%2F1;p=nonrtric.git Test env updates Image version bumps Enabled pms data-config schema validation Enabled json duplicate check in a1 simulator Issue-ID: NONRTRIC-605 Signed-off-by: BjornMagnussonXA Change-Id: I832d8ebf1e34cc449b7670bf515061aa0f2da9bf --- diff --git a/test/common/test_env-onap-istanbul.sh b/test/common/test_env-onap-istanbul.sh index 4982e192..829da8fb 100644 --- a/test/common/test_env-onap-istanbul.sh +++ b/test/common/test_env-onap-istanbul.sh @@ -69,17 +69,17 @@ NEXUS_RELEASE_REPO_ONAP=$NEXUS_RELEASE_REPO # Policy Agent image and tags POLICY_AGENT_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -POLICY_AGENT_IMAGE_TAG_LOCAL="1.2.2-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.2-SNAPSHOT" -POLICY_AGENT_IMAGE_TAG_REMOTE="1.2.2-STAGING-latest" #Will use snapshot repo -POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.2.1" +POLICY_AGENT_IMAGE_TAG_LOCAL="1.3.0-SNAPSHOT" +POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="1.3.0-SNAPSHOT" +POLICY_AGENT_IMAGE_TAG_REMOTE="1.3.0-STAGING-latest" #Will use snapshot repo +POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="1.3.0" # SDNC A1 Controller remote image and tag SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image" -SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.2.0-SNAPSHOT" ###CHECK THIS -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-STAGING-latest" -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.2.0-STAGING-latest" #Will use snapshot repo -SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.0" +SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT" ###CHECK THIS +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-STAGING-latest" +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.2.1-STAGING-latest" #Will use snapshot repo +SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.2.1" #SDNC DB remote image and tag #The DB is part of SDNC so handled in the same way as SDNC diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh index 0f6e977b..9b83044f 100755 --- a/test/common/test_env-oran-e-release.sh +++ b/test/common/test_env-oran-e-release.sh @@ -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.1.0-SNAPSHOT" -RIC_SIM_IMAGE_TAG_REMOTE="2.1.0" -RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.1.0" +RIC_SIM_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-SNAPSHOT" +RIC_SIM_IMAGE_TAG_REMOTE="2.2.0" +RIC_SIM_IMAGE_TAG_REMOTE_RELEASE="2.2.0" #Consul remote image and tag diff --git a/test/simulator-group/policy_agent/application.yaml b/test/simulator-group/policy_agent/application.yaml index 75e42004..275ad3f2 100644 --- a/test/simulator-group/policy_agent/application.yaml +++ b/test/simulator-group/policy_agent/application.yaml @@ -55,6 +55,8 @@ app: filepath: /opt/app/policy-agent/data/application_configuration.json # path where the service can store data vardata-directory: /var/policy-management-service + # path to json schema for config validation + config-file-schema-path: /application_configuration_schema.json webclient: # Configuration of the trust store used for the HTTP client (outgoing requests) # The file location and the password for the truststore is only relevant if trust-store-used == true diff --git a/test/simulator-group/ric/app.yaml b/test/simulator-group/ric/app.yaml index a4040394..c1397306 100644 --- a/test/simulator-group/ric/app.yaml +++ b/test/simulator-group/ric/app.yaml @@ -28,6 +28,8 @@ spec: value: "1" - name: ALLOW_HTTP value: "true" + - name: DUPLICATE_CHECK + value: "1" imagePullPolicy: $KUBE_IMAGE_PULL_POLICY ports: - name: http diff --git a/test/simulator-group/ric/docker-compose.yml b/test/simulator-group/ric/docker-compose.yml index 5a04ce94..37fad42d 100644 --- a/test/simulator-group/ric/docker-compose.yml +++ b/test/simulator-group/ric/docker-compose.yml @@ -35,6 +35,7 @@ services: - A1_VERSION=${G1_A1_VERSION} - REMOTE_HOSTS_LOGGING=1 - ALLOW_HTTP=true + - DUPLICATE_CHECK=1 volumes: - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro labels: @@ -52,6 +53,7 @@ services: - A1_VERSION=${G2_A1_VERSION} - REMOTE_HOSTS_LOGGING=1 - ALLOW_HTTP=true + - DUPLICATE_CHECK=1 volumes: - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro labels: @@ -69,6 +71,7 @@ services: - A1_VERSION=${G3_A1_VERSION} - REMOTE_HOSTS_LOGGING=1 - ALLOW_HTTP=true + - DUPLICATE_CHECK=1 volumes: - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro labels: