From 1a38d516d798ad009263b6f4fab461362c558841 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Wed, 21 Nov 2018 08:41:23 +0100 Subject: [PATCH] Use casablanca 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: Icc2d37b5b5de08e6f16efcfd9a149b9c6e942c4c Issue-ID: DCAEGEN2-983 Signed-off-by: Filip Krzywka --- plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml | 6 +++--- .../testcases/libraries/XnfSimulatorLibrary.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 2a928217..966e7dbe 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 @@ services: command: ["-server", "-bootstrap"] ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0-SNAPSHOT ports: - "6060:6060" - "6061:6061/tcp" @@ -64,7 +64,7 @@ services: - ves-hv-default unencrypted-ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0-SNAPSHOT ports: - "7060:6060" - "7061:6061/tcp" @@ -83,7 +83,7 @@ services: - ves-hv-default dcae-app-simulator: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.0-SNAPSHOT ports: - "6063:6063/tcp" command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"] diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py index f091de1b..568fb451 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py @@ -6,7 +6,7 @@ from time import sleep XNF_SIMULATOR_NAME = "xNF Simulator" SIMULATOR_IMAGE_NAME = "onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator" -SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":latest" +SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":1.0-SNAPSHOT" WORKSPACE_ENV = os.getenv("WORKSPACE") certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/" collector_certs_lookup_dir = "/etc/ves-hv/" -- 2.16.6