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>

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index c9e3ff0..08bbb61 100755 (executable)
--- 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 a2ae335..1bb7091 100755 (executable)
--- 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"