Loading common-openapi/.gitlab-ci.yml +2 −0 Original line number Original line Diff line number Diff line Loading @@ -75,6 +75,7 @@ CR contribution: Generation of OpenAPI: Generation of OpenAPI: stage: openapi stage: openapi before_script: before_script: - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - | - | curl --header "PRIVATE-TOKEN: $PIPELINE_PROJECT_TOKEN" "${CI_API_V4_URL}/projects/694/repository/files/common-openapi%2FgenerateOpenapi%2Esh/raw?ref=main" >> generateOpenapi.sh curl --header "PRIVATE-TOKEN: $PIPELINE_PROJECT_TOKEN" "${CI_API_V4_URL}/projects/694/repository/files/common-openapi%2FgenerateOpenapi%2Esh/raw?ref=main" >> generateOpenapi.sh - chmod +x generateOpenapi.sh - chmod +x generateOpenapi.sh Loading @@ -87,6 +88,7 @@ Generation of OpenAPI: - echo 'Generate OpenAPI' - echo 'Generate OpenAPI' - ./generateOpenapi.sh ${CI_PROJECT_NAME} project-config.yaml $CI_COMMIT_BRANCH ${AUTOMATED_OPENAPI_GENERATION_NAME} - ./generateOpenapi.sh ${CI_PROJECT_NAME} project-config.yaml $CI_COMMIT_BRANCH ${AUTOMATED_OPENAPI_GENERATION_NAME} after_script: after_script: - docker logout - version=$(cat version.txt) # Read version from file - version=$(cat version.txt) # Read version from file - cd ${CI_PROJECT_NAME} - cd ${CI_PROJECT_NAME} - | - | Loading common-openapi/generateOpenapi.sh +2 −2 Original line number Original line Diff line number Diff line Loading @@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then exit 1 exit 1 fi fi DOC2OAS_DOCKER_IMAGE=doc2oas-ie-sample:master DOC2OAS_DOCKER_IMAGE=forge.etsi.org:5050/cti/doc2oas:master # Get version from spec file name in root doc directory # Get version from spec file name in root doc directory cd doc cd doc Loading Loading @@ -42,7 +42,7 @@ git checkout "$branch_name" || git checkout -b "$branch_name" cd ../doc # Back to root doc directory for processing cd ../doc # Back to root doc directory for processing echo "\n------ Checking for docker image --------" echo "\n------ Checking for docker image --------" #docker pull "$DOCKER_IMAGE" docker pull "$DOC2OAS_DOCKER_IMAGE" echo "------ Getting spec and config files--------" echo "------ Getting spec and config files--------" # Get project prefix (e.g., gs030) from the project path # Get project prefix (e.g., gs030) from the project path Loading Loading
common-openapi/.gitlab-ci.yml +2 −0 Original line number Original line Diff line number Diff line Loading @@ -75,6 +75,7 @@ CR contribution: Generation of OpenAPI: Generation of OpenAPI: stage: openapi stage: openapi before_script: before_script: - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - | - | curl --header "PRIVATE-TOKEN: $PIPELINE_PROJECT_TOKEN" "${CI_API_V4_URL}/projects/694/repository/files/common-openapi%2FgenerateOpenapi%2Esh/raw?ref=main" >> generateOpenapi.sh curl --header "PRIVATE-TOKEN: $PIPELINE_PROJECT_TOKEN" "${CI_API_V4_URL}/projects/694/repository/files/common-openapi%2FgenerateOpenapi%2Esh/raw?ref=main" >> generateOpenapi.sh - chmod +x generateOpenapi.sh - chmod +x generateOpenapi.sh Loading @@ -87,6 +88,7 @@ Generation of OpenAPI: - echo 'Generate OpenAPI' - echo 'Generate OpenAPI' - ./generateOpenapi.sh ${CI_PROJECT_NAME} project-config.yaml $CI_COMMIT_BRANCH ${AUTOMATED_OPENAPI_GENERATION_NAME} - ./generateOpenapi.sh ${CI_PROJECT_NAME} project-config.yaml $CI_COMMIT_BRANCH ${AUTOMATED_OPENAPI_GENERATION_NAME} after_script: after_script: - docker logout - version=$(cat version.txt) # Read version from file - version=$(cat version.txt) # Read version from file - cd ${CI_PROJECT_NAME} - cd ${CI_PROJECT_NAME} - | - | Loading
common-openapi/generateOpenapi.sh +2 −2 Original line number Original line Diff line number Diff line Loading @@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then exit 1 exit 1 fi fi DOC2OAS_DOCKER_IMAGE=doc2oas-ie-sample:master DOC2OAS_DOCKER_IMAGE=forge.etsi.org:5050/cti/doc2oas:master # Get version from spec file name in root doc directory # Get version from spec file name in root doc directory cd doc cd doc Loading Loading @@ -42,7 +42,7 @@ git checkout "$branch_name" || git checkout -b "$branch_name" cd ../doc # Back to root doc directory for processing cd ../doc # Back to root doc directory for processing echo "\n------ Checking for docker image --------" echo "\n------ Checking for docker image --------" #docker pull "$DOCKER_IMAGE" docker pull "$DOC2OAS_DOCKER_IMAGE" echo "------ Getting spec and config files--------" echo "------ Getting spec and config files--------" # Get project prefix (e.g., gs030) from the project path # Get project prefix (e.g., gs030) from the project path Loading