From 6366c6877972bc918c0349f0509dfb95d760d79a Mon Sep 17 00:00:00 2001 From: Felipe Vicens Date: Thu, 25 Jun 2020 20:12:16 +0200 Subject: [PATCH] Discovering OSM internal NBI ip address by stackName Fix reports folders variable Change-Id: Icf69546283f47f4ace88a72b6381fc7a7f49e87d Signed-off-by: Felipe Vicens --- docker/Dockerfile | 2 +- robot-systest/run_test.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2ae03c9..b13f2ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,7 +45,7 @@ ENV ENVIRONMENTS_FOLDER=environments ENV PACKAGES_FOLDER=/robot-systest/osm-packages # Folder where test results should be exported -ENV ROBOT_REPORT_FOLDER=/robot-systest/results +ENV ROBOT_REPORT_FOLDER=/robot-systest/reports # Kubeconfig file ENV K8S_CREDENTIALS=/root/.kube/config diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index ac2e330..f5753cc 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -70,7 +70,7 @@ Usage: -o \\ -p \\ -t - + Options: --env-file: It is the environmental file where is described the OSM target and VIM -o [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest @@ -98,13 +98,16 @@ done eval set -- "$PARAMS" -if [[ -z $TEST ]]; then +if [[ -n "$stackName" ]]; then + export OSM_HOSTNAME=osm${stackName}_nbi +fi + +if [[ -z "${TEST}" ]]; then printf "Test not provided. \nRunning default test: sanity\n" TEST="sanity" fi - -if [[ -n "$TEST" ]]; then +if [[ -n "${TEST}" ]]; then robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/ exit 0 else -- 2.17.1