diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-05-09 15:50:19 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-05-10 11:11:59 +0200 |
| commit | 7e09dc7413c01c7bbd35fc39a42f90e2efb69241 (patch) | |
| tree | 9d9776d1b620814c953d95fcb09796f3e7aed4c8 | |
| parent | 6ba5f364f97df55469d36d802a446cdd843827d0 (diff) | |
Fix HV-VES tests when running locally
* Fixed docker registry env vars in env_local
* Random network name for every test run
Change-Id: I74ea22d1f3013e86eda18184f11d5901777b20c9
Issue-ID: DCAEGEN2-1474
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
| -rwxr-xr-x | plans/dcaegen2-collectors-hv-ves/testsuites/env.sh | 5 | ||||
| -rwxr-xr-x | plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh index c9e3ff06..08bbb61e 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh @@ -31,7 +31,7 @@ export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/" export KAFKA_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/kafka111:0.0.6" export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0" -export CONTAINERS_NETWORK="hv-ves-default" +export CONTAINERS_NETWORK="hv-ves-${RANDOM}" export HV_VES_SERVICE_NAME="hv-ves-collector" export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector" @@ -39,9 +39,8 @@ export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves" export HV_VES_HOSTNAME="dcae-hv-ves-collector" export HV_VES_COLLECTOR_NAMESPACE="onap" export HV_VES_HEALTHCHECK_CMD="curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061" -export HV_VES_VERSION="1.1-SNAPSHOT" +export HV_VES_VERSION="1.2-SNAPSHOT" export HV_VES_IMAGE="hv-collector-main" export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator" export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator" - diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh index a2ae3356..1bb70917 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh @@ -29,9 +29,9 @@ export DOCKER_REGISTRY="docker.io" export DOCKER_REGISTRY_PREFIX="" export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6" -export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0" +export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0" -export CONTAINERS_NETWORK="hv-ves-default" +export CONTAINERS_NETWORK="hv-ves-${RANDOM}" export HV_VES_SERVICE_NAME="hv-ves-collector" export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector" |