Loading .gitlab-ci.yml +10 −14 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ stages: variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" FORGE_REGISTRY: forge.etsi.org:5050 build_image: stage: build Loading @@ -16,27 +17,24 @@ build_image: changes: - Dockerfile - requirements.txt - if: '$CI_COMMIT_BRANCH == "develop"' changes: - Dockerfile - requirements.txt - when: never script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" - echo "Using IMAGE_NAME=$IMAGE_NAME" before_script: - echo "CI_REGISTRY = $CI_REGISTRY" - echo "CI_PROJECT_PATH = $CI_PROJECT_PATH" - export IMAGE_NAME="$CI_REGISTRY/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')" - echo "IMAGE_NAME = $IMAGE_NAME" script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker pull $IMAGE_NAME:cache || true - > docker build --cache-from=$IMAGE_NAME:cache -t $IMAGE_NAME:$CI_COMMIT_SHA -t $IMAGE_NAME:cache . - docker build --cache-from=$IMAGE_NAME:cache -t $IMAGE_NAME:$CI_COMMIT_SHA -t $IMAGE_NAME:cache . - docker push $IMAGE_NAME:$CI_COMMIT_SHA - docker push $IMAGE_NAME:cache Loading @@ -46,13 +44,13 @@ build_image: reports: dotenv: build.env after_script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" - export IMAGE_NAME="$CI_REGISTRY/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')" - echo "IMAGE_TAG=$CI_COMMIT_SHA" >> build.env - echo "IMAGE_NAME=$IMAGE_NAME" >> build.env test_documentation: stage: test image: $IMAGE_NAME:$CI_COMMIT_SHA image: $IMAGE_NAME:$IMAGE_TAG needs: ["build_image"] rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' Loading @@ -60,8 +58,6 @@ test_documentation: - when: never variables: GIT_STRATEGY: clone before_script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" script: - ls -la - python -m unittest discover -s ./doc/tests -t ./doc No newline at end of file Loading
.gitlab-ci.yml +10 −14 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ stages: variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" FORGE_REGISTRY: forge.etsi.org:5050 build_image: stage: build Loading @@ -16,27 +17,24 @@ build_image: changes: - Dockerfile - requirements.txt - if: '$CI_COMMIT_BRANCH == "develop"' changes: - Dockerfile - requirements.txt - when: never script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" - echo "Using IMAGE_NAME=$IMAGE_NAME" before_script: - echo "CI_REGISTRY = $CI_REGISTRY" - echo "CI_PROJECT_PATH = $CI_PROJECT_PATH" - export IMAGE_NAME="$CI_REGISTRY/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')" - echo "IMAGE_NAME = $IMAGE_NAME" script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker pull $IMAGE_NAME:cache || true - > docker build --cache-from=$IMAGE_NAME:cache -t $IMAGE_NAME:$CI_COMMIT_SHA -t $IMAGE_NAME:cache . - docker build --cache-from=$IMAGE_NAME:cache -t $IMAGE_NAME:$CI_COMMIT_SHA -t $IMAGE_NAME:cache . - docker push $IMAGE_NAME:$CI_COMMIT_SHA - docker push $IMAGE_NAME:cache Loading @@ -46,13 +44,13 @@ build_image: reports: dotenv: build.env after_script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" - export IMAGE_NAME="$CI_REGISTRY/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')" - echo "IMAGE_TAG=$CI_COMMIT_SHA" >> build.env - echo "IMAGE_NAME=$IMAGE_NAME" >> build.env test_documentation: stage: test image: $IMAGE_NAME:$CI_COMMIT_SHA image: $IMAGE_NAME:$IMAGE_TAG needs: ["build_image"] rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' Loading @@ -60,8 +58,6 @@ test_documentation: - when: never variables: GIT_STRATEGY: clone before_script: - export IMAGE_NAME="registry.gitlab.com/$(echo $CI_PROJECT_PATH | tr '[:upper:]' '[:lower:]')/app" script: - ls -la - python -m unittest discover -s ./doc/tests -t ./doc No newline at end of file