Commit 3edccc09 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Robot scripts and dockerfile adjustment with results directory

parent 540ff21a

services/run_capif_tests.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ DOCKER_ROBOT_IMAGE_VERSION=4.0 
cd ..

cd ..

REPOSITORY_BASE_FOLDER=${PWD}

REPOSITORY_BASE_FOLDER=${PWD}

TEST_FOLDER=$REPOSITORY_BASE_FOLDER/tests

TEST_FOLDER=$REPOSITORY_BASE_FOLDER/tests

RESULT_FOLDER=$REPOSITORY_BASE_FOLDER/results/$timestamp

RESULT_FOLDER=$REPOSITORY_BASE_FOLDER/results

ROBOT_DOCKER_FILE_FOLDER=$REPOSITORY_BASE_FOLDER/tools/robot

ROBOT_DOCKER_FILE_FOLDER=$REPOSITORY_BASE_FOLDER/tools/robot





# nginx Hostname and http port (80 by default) to reach for tests

# nginx Hostname and http port (80 by default) to reach for tests

tools/robot/entrypoint.sh

+3 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,8 @@ TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt 
ARGUMENTS=

ARGUMENTS=

OPTIONS=

OPTIONS=





timestamp=$(date +"%Y%m%d_%H%M%S")



while [ -n "$1" ]; do # while loop starts

while [ -n "$1" ]; do # while loop starts





        case "$1" in

        case "$1" in
@@ -45,4 +47,4 @@ then 
fi

fi





pip install -r $BASE_REQ_FILE

pip install -r $BASE_REQ_FILE

robot -d ROBOT_RESULTS_DIRECTORY --xunit xunit.xml $OPTIONS $ARGUMENTS
 
robot -d ROBOT_RESULTS_DIRECTORY/$timestamp --xunit xunit.xml $OPTIONS $ARGUMENTS