Merge "Step Policy Agent version for D Maintenance" into dawn

diff --combined test/common/test_env-oran-d-release.sh
index 5dd2588,2a99f54..77907d3
--- 1/test/common/test_env-oran-d-release.sh
--- 2/test/common/test_env-oran-d-release.sh
+++ b/test/common/test_env-oran-d-release.sh
@@@ -60,10 -60,10 +60,10 @@@ NEXUS_RELEASE_REPO_ORAN=$NEXUS_RELEASE_
  
  # Policy Agent base image and tags
  POLICY_AGENT_IMAGE_BASE="o-ran-sc/nonrtric-policy-agent"
- POLICY_AGENT_IMAGE_TAG_LOCAL="2.2.0-SNAPSHOT"
- POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.0-SNAPSHOT"
- POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.0"
- POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.0"
+ POLICY_AGENT_IMAGE_TAG_LOCAL="2.2.1-SNAPSHOT"
+ POLICY_AGENT_IMAGE_TAG_REMOTE_SNAPSHOT="2.2.1-SNAPSHOT"
+ POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.1"
+ POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.1"
  
  # ECS image and tags
  ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
@@@ -390,7 -390,6 +390,7 @@@ CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube
  CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11"         # nginx resolver for docker
  CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/"           # Path prefix for forwarding policy calls to NGW
  CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/"          # Path prefix for forwarding ecs calls to NGW
 +CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/"         # Path prefix for forwarding ecs calls to NGW
  
  NRT_GATEWAY_APP_NAME="nonrtricgateway"                   # Name of the Gateway container
  NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway"