Update DMI demo stub version and container image configuration

- Updated the DMI_DEMO_STUB_VERSION to `1.8.0-SNAPSHOT` in `.env` and `test.properties`.
- Modified `ncmp-dmi-plugin-demo-and-csit-stub` Docker Compose service to reference:
    - Custom container name using `${NCMP_DMI_PLUGIN_DEMO_AND_CSIT_STUB_CONTAINER_NAME}`.
    - Image from `${DOCKER_REPO}/onap/dmi-stub:${DMI_DEMO_STUB_VERSION}`.
- Ensures consistent version control and improved flexibility in image source and container naming.

Issue-ID: CPS-2837
Change-Id: Ic2951dee646b900294e019a4fee021bf5d875b01
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>

diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties
index 53e3105..a1d4006 100644 (file)
--- a/csit/plans/cps/test.properties
+++ b/csit/plans/cps/test.properties
@@ -19,8 +19,8 @@ DMI_SERVICE_URL=http://$DMI_HOST:$DMI_PORT
 DOCKER_REPO=nexus3.onap.org:10003
 
 CPS_VERSION=latest
-DMI_VERSION=latest
-DMI_DEMO_STUB_VERSION=latest
+DMI_VERSION=1.8.0-SNAPSHOT
+DMI_DEMO_STUB_VERSION=1.8.0-SNAPSHOT
 
 ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000
 CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000

diff --git a/docker-compose/cps-base.yml b/docker-compose/cps-base.yml
index 78d77b5..6bdc41b 100644 (file)
--- a/docker-compose/cps-base.yml
+++ b/docker-compose/cps-base.yml
@@ -171,7 +171,7 @@ services:
 
   ncmp-dmi-plugin-demo-and-csit-stub:
     container_name: ${NCMP_DMI_PLUGIN_DEMO_AND_CSIT_STUB_CONTAINER_NAME:-ncmp-dmi-plugin-demo-and-csit-stub}
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/dmi-stub:${DMI_DEMO_STUB_VERSION:-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/dmi-stub:${DMI_DEMO_STUB_VERSION:-1.8.0-SNAPSHOT}
     ports:
       - ${DMI_DEMO_STUB_PORT:-8784}:8092
     environment:

diff --git a/docker-compose/dmi-services.yml b/docker-compose/dmi-services.yml
index 5e16aec..9288400 100644 (file)
--- a/docker-compose/dmi-services.yml
+++ b/docker-compose/dmi-services.yml
@@ -106,7 +106,7 @@ services:
 
   ncmp-dmi-plugin:
     container_name: ${NCMP_DMI_PLUGIN_CONTAINER_NAME:-ncmp-dmi-plugin}
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.8.0-SNAPSHOT-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.8.0-SNAPSHOT}
     ports:
       - ${DMI_PORT:-8783}:8080
     depends_on:

diff --git a/docker-compose/env/endurance.env b/docker-compose/env/endurance.env
index 176fc22..f03f0a7 100644 (file)
--- a/docker-compose/env/endurance.env
+++ b/docker-compose/env/endurance.env
@@ -21,9 +21,11 @@ KAFKA_PORT=9093
 
 NCMP_DMI_PLUGIN_CONTAINER_NAME=endurance-ncmp-dmi-plugin
 DMI_PORT=8786
+DMI_VERSION=1.8.0-SNAPSHOT
 
 NCMP_DMI_PLUGIN_DEMO_AND_CSIT_STUB_CONTAINER_NAME=endurance-ncmp-dmi-plugin-demo-and-csit-stub
 DMI_DEMO_STUB_PORT=8787
+DMI_DEMO_STUB_VERSION=1.8.0-SNAPSHOT
 
 POLICY_EXECUTOR_STUB_CONTAINER_NAME=endurance-policy-executor-stub
 POLICY_EXECUTOR_STUB_PORT=8788

diff --git a/docker-compose/env/kpi.env b/docker-compose/env/kpi.env
index 2a779c2..5cdca78 100644 (file)
--- a/docker-compose/env/kpi.env
+++ b/docker-compose/env/kpi.env
@@ -21,9 +21,11 @@ KAFKA_PORT=9092
 
 NCMP_DMI_PLUGIN_CONTAINER_NAME=kpi-ncmp-dmi-plugin
 DMI_PORT=8783
+DMI_VERSION=1.8.0-SNAPSHOT
 
 NCMP_DMI_PLUGIN_DEMO_AND_CSIT_STUB_CONTAINER_NAME=kpi-ncmp-dmi-plugin-demo-and-csit-stub
 DMI_DEMO_STUB_PORT=8784
+DMI_DEMO_STUB_VERSION=1.8.0-SNAPSHOT
 
 POLICY_EXECUTOR_STUB_CONTAINER_NAME=kpi-policy-executor-stub
 POLICY_EXECUTOR_STUB_PORT=8785