fix hvves files for CI
Issue-ID: INT-1594
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ifafdfd0067e810341d5626369db6853e0d427b0f
Signed-off-by: mrichomme <morgan.richomme@orange.com>
diff --git a/robot/testsuites/hvves-ci.robot b/robot/testsuites/hvves-ci.robot
index 74423fe..ac33090 100644
--- a/robot/testsuites/hvves-ci.robot
+++ b/robot/testsuites/hvves-ci.robot
@@ -1,7 +1,7 @@
*** Settings ***
Documentation HV-VES 'Sunny Scenario' Robot Framework test - message is sent to the collector and Kafka topic is checked if the message has been published. Content is decoded and checked.
Default Tags hvves ete
-Test Timeout 1m
+Test Timeout 5m
Resource ../resources/global_properties.robot
Resource ../resources/dcae/hvves.robot
Library OperatingSystem
@@ -13,7 +13,7 @@
*** Test Cases ***
HV-VES SSL test case
- [Setup] Run Process /app/setup-hvves.sh shell=yes --option argument
+ [Setup] Run Process /app/setup-hvves.sh shell=yes
Mode ${HVVES_CONFIG_SSL}
Send Message Over Ssl ${GLOBAL_DCAE_HVVES_SERVER_NAME} ${GLOBAL_DCAE_HVVES_SERVER_PORT}
Wait Until Keyword Succeeds 10s 2s Check If Topic Exists ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_NAME} ${GLOBAL_DMAAP_MESSAGE_ROUTER_SERVER_PORT} ${HVVES_KAFKA_TOPIC_SSL}
diff --git a/setup-hvves.sh b/setup-hvves.sh
index 040b2fb..f81799b 100755
--- a/setup-hvves.sh
+++ b/setup-hvves.sh
@@ -5,7 +5,7 @@
# Copy the stuff to HV-VES and Robot pods.
#
NAMESPACE=${NAMESPACE:-onap}
-DIR=${DIR:"/tmp"}
+DIR=${DIR:-/tmp}
HVVESPOD=$(kubectl -n $NAMESPACE get pods --no-headers=true -o custom-columns=:metadata.name | grep hv-ves)
@@ -60,4 +60,3 @@
sign_server_and_client_cert "$DIR"
create_pkcs12_ca_and_server "$DIR"
copy_server_certs_to_hvves "$DIR" "$NAMESPACE" "$HVVESPOD" "$DIR"
-cleanup "$DIR"