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

Cleanup of gitlab-ci + exposing docs generated 



Signed-off-by: default avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent cebf23e1

sa5/.gitlab-ci.yml

+9 −49
Original line number Diff line number Diff line
@@ -25,33 +25,8 @@ stages: 
  - validation

  - generation

    

# Resolve:

  # stage: resolve

  # # only:

    # # - pushes

    # # - merge_requests

  # script:

    # - echo 'Resolve'

    # - git clone https://forge.3gpp.org/rep/reinaortega/3gpp-scripts.git scripts/

  # after_script:

    # - ls

    # - echo "RESOLVE_ID=${CI_JOB_ID}" >> resolveId.env

    # - RESOLVE_ID=${CI_JOB_ID}

    # - echo ${RESOLVE_ID} #>> resolveId.env

  # artifacts:

    # paths:

      # - scripts/

    # #expire_in: 5 min #It should be deleted after last stage of this pipeline

    # reports:

       # dotenv: resolveId.env

    

YANG Strict:

  stage: validation

  # only:

    # - pushes

  # needs:

    # - job: Resolve

      # artifacts: true

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fvalidate-data-models%2Esh/raw?ref=master" >> validate-data-models.sh
@@ -62,16 +37,12 @@ YANG Strict: 
  after_script:

    - ls

  artifacts:

    name: "$CI_JOB_NAME"

    paths:

      - ${LOGFILE_YANG}



YANG 3GPP Checks:

  stage: validation

  # only:

    # - pushes

  # needs:

    # - job: Resolve

      # artifacts: true

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Flint-data-models%2Esh/raw?ref=master" >> lint-data-models.sh
@@ -80,16 +51,12 @@ YANG 3GPP Checks: 
    - echo 'YANG 3GPP Checks'

    - ./lint-data-models.sh .

  artifacts:

    name: "$CI_JOB_NAME"

    paths:

      - ${LOGFILE_LINT}

    

Validate OpenAPI:

  stage: validation

  # only:

    # - pushes

  # needs:

    # - job: Resolve

      # artifacts: true

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fvalidate-all%2Esh/raw?ref=master" >> validate-all.sh
@@ -98,6 +65,7 @@ Validate OpenAPI: 
    - echo 'Validate OpenAPI'

    - ./validate-all.sh ./OpenAPI

  artifacts:

    name: "$CI_JOB_NAME"

    paths:

      - ./OpenAPI/${LOGFILE_OPENAPI}
@@ -106,25 +74,17 @@ CR contribution: 
  when: on_success

  only:

    - merge_requests

  # needs:

    # - job: Resolve

      # artifacts: true

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/57/repository/files/sa5%2Fgenerate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh

    - chmod +x generate_changemarks.sh

  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/    

  artifacts:

    paths:

      - ./*.docx

  # after_script:

    # - echo 'Removing Resolve artifact ...'

    # - echo ${SA5_ACCESS_TOKEN}

    # - echo ${CI_API_V4_URL}

    # - echo ${CI_PROJECT_ID}

    # - echo ${RESOLVE_ID}

    # - |

     # curl --request DELETE --header "PRIVATE-TOKEN : ${SA5_ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${RESOLVE_ID}/artifacts"

    
 No newline at end of file
 
      - docs/

    expose_as: 'Word document contribution'
 
 No newline at end of file

sa5/generate_changemarks.sh

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ echo "\n------ Checking for docker image --------" 
docker pull "$DOCKER_IMAGE"



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

rm *.docx

rm **/*.docx



echo "------ Parsing repo URL --------"
@@ -18,7 +18,7 @@ echo "PROJECT ID:" $2 
echo "MERGE IID:" $3



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

docker container run --rm -v$(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --outPath=/tmp/ "$HOST_URL" "$2" "$PROJECT_NAME" "$3"

docker container run --rm -v $(pwd)/docs:/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --outPath=/tmp/ "$HOST_URL" "$2" "$PROJECT_NAME" "$3"



exit 0