Enhancement of Jenkins build scripts for:

1) Detection of branch that triggers the build to determine whether or not to generate the .docx documents
2) Check for udpates on the robot2doc tool
3) Removal of precedent existing .docx documents in the workspace before running a new job

.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"

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/ \

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=$? 
 

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 res=0
+fi
 
 exit $res && $res2