Switch to DMaaP kafka image

[integration/csit.git] / plans / dcaegen2-collectors-hv-ves / testsuites / env.sh

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index bbb5493..c9e3ff0 100755 (executable)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -18,14 +18,19 @@
 # ============LICENSE_END=========================================================
 
 # using WORKSPACE variable defined in run-csit.sh
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries --noncritical non-critical"
 
 export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
 export CONSUL_HOST="consul-server"
 export CONFIG_BINDING_SERVICE="config-binding-service"
 
-export DOCKER_REGISTRY="nexus3.onap.org:10001"
+export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
+export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
 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 HV_VES_SERVICE_NAME="hv-ves-collector"
 export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
@@ -33,7 +38,7 @@ export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
 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_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_IMAGE="hv-collector-main"
 export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"