Commit 703ce97c authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega Committed by Giacomo Bernini
Browse files

Some fixes:


- update robot2doc in docker image if updates available
- creating .docx only for XXXXX-dev and master branches

Signed-off-by: default avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent f06df0c7
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ cd "$(dirname "$0")"
run_dir="$(pwd)"
run_dir="$(pwd)"


bash ./scripts/build-container.sh
bash ./scripts/build-container.sh
bash ./scripts/run-container.sh "${run_dir}"
bash ./scripts/run-container.sh "${run_dir}" "$(BRANCH_NAME)"


ret=$?
ret=$?
echo "Final validation result: $ret"
echo "Final validation result: $ret"
+2 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ ADD extensions /home/etsi/dev/robot/extensions


RUN ls /home/etsi/dev/robot
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 \
RUN DEBIAN_FRONTED=noninteractive \
	cd /home/etsi/dev/ \
	cd /home/etsi/dev/ \
+3 −1
Original line number Original line Diff line number Diff line
@@ -7,8 +7,10 @@


mkdir -p build
mkdir -p build


echo "Using git branch $2"

docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \
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=$? 
ret=$? 


+8 −4
Original line number Original line Diff line number Diff line
@@ -17,11 +17,15 @@ for i in */*/*.robot ; do
    fi
    fi
done
done


if [[ "$1" =~ .*-dev$ || "$1" == "master" ]]; then

	cd /home/etsi/dev/robot2doc/robot2doc
	cd /home/etsi/dev/robot2doc/robot2doc


	mkdir -p /home/etsi/dev/build
	mkdir -p /home/etsi/dev/build


	python3 create_sols.py ../../robot 'local' ../../build
	python3 create_sols.py ../../robot 'local' ../../build
	res2=$?
	res2=$?
else res2=0
fi


exit $res && $res2
exit $res && $res2