diff options
| author |   Filip Krzywka <filip.krzywka@nokia.com> | 2018-11-21 08:57:27 +0100 |
|---|---|---|
| committer | Filip Krzywka <filip.krzywka@nokia.com> | 2018-11-28 08:58:39 +0100 |
| commit | 5d8a8dfbea72e0e9d8a600098ff0b1c1126e1c3f (patch) | |
| tree | b01dba69f536a77525e4558e6cb05899391cfc62 | |
| parent | c3bf03a32a404f86fdf03287a41a8d1b78822ecf (diff) | |
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>
3 files changed, 11 insertions, 6 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env index 2a8bbe34..a64ba26a 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 diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 092af0c0..9ba27750 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}/${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 @@ services: - 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 @@ services: - 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"] diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py index ec405a91..46b72b0b 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py @@ -8,7 +8,8 @@ XNF_SIMULATOR_NAME = "xNF Simulator" HV_VES_COLLECTOR_NAMESPACE="onap" HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves" SIMULATOR_IMAGE_NAME = HV_VES_COLLECTOR_NAMESPACE + "/" + HV_VES_GROUP_ID + ".hv-collector-xnf-simulator" -SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":latest" +HV_VES_VERSION="1.1-SNAPSHOT" +SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":" + HV_VES_VERSION WORKSPACE_ENV = os.getenv("WORKSPACE") certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/" collector_certs_lookup_dir = "/etc/ves-hv/" |