commit 5d8a8dfbea72e0e9d8a600098ff0b1c1126e1c3f
author Filip Krzywka <filip.krzywka@nokia.com> Wed Nov 21 08:57:27 2018 +0100
committer Filip Krzywka <filip.krzywka@nokia.com> Wed Nov 28 08:58:39 2018 +0100
tree b01dba69f536a77525e4558e6cb05899391cfc62
parent c3bf03a32a404f86fdf03287a41a8d1b78822ecf

Use dublin latest image

This follows up changes to image tagging made in hv-ves repository
and allows CI pipeline to use latest maintenance images for testing.

Change-Id: I6cb65aa3144831cd36db2f714d90263d2dfddacf
Issue-ID: DCAEGEN2-983
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>

plans/dcaegen2-collectors-hv-ves/testsuites/.env

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env
index 2a8bbe3..a64ba26 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/.env
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env
@@ -1,8 +1,12 @@
 
 HV_VES_COLLECTOR_NAMESPACE=onap
 HV_VES_GROUP_ID=org.onap.dcaegen2.collectors.hv-ves
-HV_VES_IMAGE=hv-collector-main:latest
-DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator:latest
+HV_VES_IMAGE=hv-collector-main
+DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator
+
+# IF CHANGING BELOW VALUE, REMEMBER TO UPDATE ALSO XNF-SIMULATOR VERSION
+# IN XNF_SIMULATOR_LIBRARY PYTHON FILE.
+HV_VES_VERSION=1.1-SNAPSHOT
 
 HV_VES_CONFIG_URL=http://consul:8500/v1/kv/veshv-config?raw=true
 HV_VES_HEALTHCHECK_CMD=curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061

plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 092af0c..9ba2775 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -42,7 +42,7 @@
     command: ["-server", "-bootstrap"]
 
   ves-hv-collector:
-    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}
+    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
     - "6060:6060"
     - "6061:6061/tcp"
@@ -63,7 +63,7 @@
     - ves-hv-default
 
   unencrypted-ves-hv-collector:
-    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}
+    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
     - "7060:6060"
     - "7061:6061/tcp"
@@ -82,7 +82,7 @@
     - ves-hv-default
 
   dcae-app-simulator:
-    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}
+    image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION}
     ports:
     - "6063:6063/tcp"
     command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"]