Commit 02d6579a authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Use version 0.21.0 from puccini

parent 3e56dbf9

SOL001/scripts/Dockerfile.puccini

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ RUN tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz 




ENV PATH="${PATH}:/usr/local/go/bin"

ENV PATH="${PATH}:/usr/local/go/bin"





RUN git clone https://github.com/tliron/puccini.git /puccini

RUN git clone -b v0.21.0 https://github.com/tliron/puccini.git /puccini





RUN ./puccini/scripts/build

RUN ./puccini/scripts/build

SOL001/scripts/build_tosca_parser.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ if [ ${TOSCA_PARSER} == "Cloudnet-TOSCA-toolbox" ] ; then 




elif [ ${TOSCA_PARSER} == "Puccini" ] ; then

elif [ ${TOSCA_PARSER} == "Puccini" ] ; then

	#Build Puccini docker from Dockerfile

	#Build Puccini docker from Dockerfile

	docker build -t puccini -f Dockerfile.puccini .

	docker build -t puccini:v0.21.0 -f Dockerfile.puccini .

	

	

fi

fi

SOL001/scripts/parse_tosca_definitions.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ elif [ ${TOSCA_PARSER} == "Puccini" ] ; then 
	finalResult=0

	finalResult=0

	echo "Puccini: Validation starting ..."

	echo "Puccini: Validation starting ..."

		

		

	docker run --rm -v "${PWD}:/sol001" puccini ./sol001/puccini_parse.sh &> debugPuccini.log

	docker run --rm -v "${PWD}:/sol001" puccini:v0.21.0 ./sol001/puccini_parse.sh &> debugPuccini.log

		

		

	if [ $? == 0 ] ; then

	if [ $? == 0 ] ; then

		echo "Puccini: ++++ TOSCA parser finished validation with no errors"

		echo "Puccini: ++++ TOSCA parser finished validation with no errors"