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

Adding MR link to the CR

parent 2db65dda

sa5/.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -104,10 +104,12 @@ Word CR text: 
     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_start%2Edocx/raw?ref=master" >> sa5_delimiter_start.docx

    - |

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_end%2Edocx/raw?ref=master" >> sa5_delimiter_end.docx

    - |

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_coversheet_template%2Edocx/raw?ref=master" >> sa5_coversheet_template.docx

  script:

    - echo 'CR contribution'

    - mkdir docs

    - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID} sa5_delimiter_start.docx sa5_delimiter_end.docx

    - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID} sa5_delimiter_start.docx sa5_delimiter_end.docx sa5_coversheet_template.docx

  artifacts:

    paths:

      - docs/

sa5/generate_changemarks.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/bash



DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.6.0

DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.7.0



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

docker pull "$DOCKER_IMAGE"
@@ -29,7 +29,7 @@ echo "MERGE IID:" $3 


echo "\n------ Generating change marks --------"

#Using merge ID to get the diff

docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --filename --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$3"

docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --filename --preprocessor sa5 --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3"

#Using the generated patch file from above (this approach eliminates the issue of diff limit

#docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --patchfile "merge_patch.patch" --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3"

sa5/sa5_coversheet_template.docx

0 → 100644
+21.8 KiB

File added.

No diff preview for this file type.

View file