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

Add delimiters documents for SA5 + use combine feature for CR generation

parent 2dae9c58
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -78,12 +78,14 @@ CR contribution:
    - |
     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fgenerate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh
    - chmod +x generate_changemarks.sh
    - |
     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fsa5_delimiter_start%2Edocx/raw?ref=master" >> sa5_delimiter_start.docx
    - |
     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fsa5_delimiter_end%2Edocx/raw?ref=master" >> sa5_delimiter_end.docx
  script:
    - echo 'CR contribution'
    - mkdir docs
    - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID}
    - mkdir docs
    - cp *.docx docs/    
    - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID} sa5_delimiter_start.docx sa5_delimiter_end.docx
  artifacts:
    paths:
      - docs/
+2 −2
Original line number Diff line number Diff line
#!/bin/bash

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

echo "\n------ Checking for docker image --------"
docker pull "$DOCKER_IMAGE"
@@ -18,7 +18,7 @@ echo "PROJECT ID:" $2
echo "MERGE IID:" $3

echo "\n------ Generating change marks --------"
docker container run --rm -v $(pwd)/docs:/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --outPath=/tmp/ "$HOST_URL" "$2" "$PROJECT_NAME" "$3"
docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3"

exit 0
+23.3 KiB

File added.

No diff preview for this file type.

+23.4 KiB

File added.

No diff preview for this file type.