From bc1f8967c878f9075cd915569a0d7bb392c2d71f Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Mon, 3 Sep 2018 11:05:11 +0200 Subject: Remove race condition - moved containers logs to separate folder in archives to allow easier debugging. Also saved xNF simulators logs there as they are not specified in docker-compose file - renamed message-routing test file as it's name was accidentaly set during one of rebases - fixed bug where variables passed from Robot testcase were evaluated as strings instead of booleans Change-Id: If21c3983df0869bbc7b8378f3bf5344cad05350b Issue-ID: DCAEGEN2-664 Signed-off-by: Filip Krzywka --- test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh | 10 +--------- .../plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'test/csit/plans') diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh index 72dacf6a2..6b527fc22 100755 --- a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh +++ b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh @@ -25,16 +25,8 @@ make FILE=invalid_client CA=invalid_trust cd .. export DOCKER_REGISTRY="nexus3.onap.org:10001" -CURRENT_DIR=${PWD##*/} -VES_HV_CONTAINER_NAME=ves-hv-collector - -# little race condition between container start-up and required files copying below docker-compose up -d -COMPOSE_VES_HV_CONTAINER_NAME=${CURRENT_DIR}_${VES_HV_CONTAINER_NAME}_1 -echo "COPY tls authorization files to container: ${COMPOSE_VES_HV_CONTAINER_NAME}" -docker cp ssl/. ${COMPOSE_VES_HV_CONTAINER_NAME}:/etc/ves-hv -# race condition end - +mkdir ${WORKSPACE}/archives/containers_logs export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries" \ No newline at end of file diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh index 91ad90305..84d36667e 100755 --- a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh +++ b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh @@ -4,7 +4,7 @@ cd ssl make clean cd .. -docker-compose logs > ${WORKSPACE}/archives/docker-compose.log +docker-compose logs > ${WORKSPACE}/archives/containers_logs/docker-compose.log docker-compose down docker-compose rm -f -- cgit 1.2.3-korg