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

Update specification tools docker images name

parent 77e365e0

specifications/generateCR/.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Checking conflicts: 
      variables:

        MERGE_REQUEST_MILESTONE: "all"

  allow_failure: true

  image: python:3.9.18-slim-bullseye

  image: forge.etsi.org:5050/cti/md-specs-dev/tools/generatecr:master

  tags:

    - docker

  before_script:
@@ -45,7 +45,7 @@ Checking conflicts: 
    - git clone "https://oauth2:${SPECIFICATIONS_PIPELINE_TOKEN}@$CI_SERVER_HOST/rep/$CI_PROJECT_PATH.git" ${CI_PROJECT_NAME}

  script:

    - echo 'Checking conflicts'

    - ./checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $SPECIFICATIONS_PIPELINE_TOKEN

    - /generateCR/checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $SPECIFICATIONS_PIPELINE_TOKEN

  artifacts:

    when: on_failure

    paths:

specifications/generateCR/generate_changemarks.sh

+6 −3
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 
#!/bin/bash



FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.21.0

GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master

DOCKER_IMAGE=pandoc/core:3.1.1.0

GENERATE_CHANGEMARKS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/generatecr:master



#Parameters
@@ -29,7 +28,11 @@ echo "mec_coversheet_template:" $5 
echo "MIKE_ACCESS_TOKEN:" $6



echo "\n------ Checking for docker image --------"

docker pull "$DOCKER_IMAGE"

echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker pull "$GENERATE_CHANGEMARKS_DOCKER_IMAGE"

echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker pull "$FORGELIB_DOCKER_IMAGE"





echo "------ Removing previous outputs --------"

rm **/*.docx

specifications/publish_spec.sh

+20 −10
Original line number Diff line number Diff line
@@ -11,11 +11,18 @@ 
#

#!/bin/bash



DOCKER_IMAGE=pandoc:master

TOOLS_DOCKER_IMAGE=generatechangemarks:master

PANDOC_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/generatebaseline/pandoc:master

GENERATE_BASELINE_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/generatebaseline:master

MARKDOWN_TOOLS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/markdowntools:master



echo "\n------ Checking for docker image --------"

docker pull "$DOCKER_IMAGE"

echo "$PANDOC_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker pull "$PANDOC_DOCKER_IMAGE"

echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker pull "$GENERATE_BASELINE_DOCKER_IMAGE"

echo "$MARKDOWN_TOOLS_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker pull "$MARKDOWN_TOOLS_DOCKER_IMAGE"





echo "------ Removing previous outputs --------"

rm **/*.docx
@@ -49,22 +56,25 @@ done 


for i in *.md ;  do

    if [ $i != 'README.md' ]; then

    	if [[ $i =~ (TS|TR).*\.md ]] ; then

    	if [[ $i =~ (GS|GR).*\.md ]] ; then

        	echo "\n------ Processing MD file to combine all clauses (::include) -------"

            docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec "$i" > combined.md

            cat combined.md > $i

			echo "\n------ Adding TOC to spec --------"

	      	docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" generateTOC --add-content "/tmp/$i"

	      	docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_BASELINE_DOCKER_IMAGE" generateTOC --add-content "/tmp/$i"

	  	fi

	    echo "\n------ Preparaing spec --------"

	    docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" pandocFilter -o "/tmp/" "/tmp/$i"

	    docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_BASELINE_DOCKER_IMAGE" pandocFilter -o "/tmp/" "/tmp/$i"

	    echo "\n------ Publishing spec --------"

		mkdir baseline

	    # Word output

	    docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${3}" -o "baseline/${4}_${2}.docx"

	    docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$PANDOC_DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${3}" -o "baseline/${4}_${2}.docx"

	    #echo 'docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t pdf -o "${4}_${2}.pdf"'

	    if [ "$5" != "onlyDocx" ]; then

			# PDF Output

			docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t pdf -o "baseline/${4}_${2}.pdf"

			docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$PANDOC_DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t pdf -o "baseline/${4}_${2}.pdf"

			# EPUB Output

			docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown+escaped_line_breaks -t epub3 -o "baseline/${4}_${2}.epub" --metadata title="${PROJECT_NAME}_${2}" --metadata creator="oneM2M Partnership Project" --metadata rights="Copyright 2024 oneM2M Partners

			docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$PANDOC_DOCKER_IMAGE" "/data/$i" -f markdown+escaped_line_breaks -t epub3 -o "baseline/${4}_${2}.epub" --metadata title="${PROJECT_NAME}_${2}" --metadata creator="oneM2M Partnership Project" --metadata rights="Copyright 2024 oneM2M Partners

hip Project"

		fi

	fi