diff --git a/.jenkins.sh b/.jenkins.sh index 3bad4e68f952186871fbe544cc7ac1c9422b8668..010affd4a791c1a4820166c515ce1ad04a7d3b0a 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -9,8 +9,10 @@ cd "$(dirname "$0")" run_dir="$(pwd)" +echo "Using git branch $GIT_BRANCH" + bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" +bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" ret=$? echo "Final validation result: $ret" diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 9f753df87329ee5f9811c52fab79cee8e0018b36..bf5f18016e4e9c9175fbc6ee663c262a3e3009fd 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -35,6 +35,8 @@ ADD extensions /home/etsi/dev/robot/extensions RUN ls /home/etsi/dev/robot +#To avoid to use the cache when new commits are available +ADD "https://forge.etsi.org/rep/api/v4/projects/224/repository/branches/master" /tmp/devalidateCache RUN DEBIAN_FRONTED=noninteractive \ cd /home/etsi/dev/ \ diff --git a/scripts/run-container.sh b/scripts/run-container.sh index c0ea09699ff44dd9ef5ee6e29b2564683f7a7099..af5a8eb9b9d0cd629bb2492dcc9310be1e182046 100644 --- a/scripts/run-container.sh +++ b/scripts/run-container.sh @@ -7,8 +7,10 @@ mkdir -p build +echo "Using git branch $2" + docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ - -c "/home/etsi/dev/robot/scripts/validate.sh" + -c "/home/etsi/dev/robot/scripts/validate.sh $2" ret=$? diff --git a/scripts/validate.sh b/scripts/validate.sh index ae06e2ea0e0d328935f8d4de143093ff075d95c1..bf93a75350351447499ab70b2d9a1b207d029b79 100644 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -17,11 +17,19 @@ for i in */*/*.robot ; do fi done -cd /home/etsi/dev/robot2doc/robot2doc +echo "Using git branch $1" mkdir -p /home/etsi/dev/build +cd /home/etsi/dev/build +rm -r -v * -python3 create_sols.py ../../robot 'local' ../../build -res2=$? +if [[ "$1" =~ .*-dev$ || "$1" =~ \d+(\.?\d)+ || "$1" == "master" ]]; then + + cd /home/etsi/dev/robot2doc/robot2doc + + python3 create_sols.py ../../robot 'local' ../../build + res2=$? +else res2=0 +fi exit $res && $res2