diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index ed2a2815..16cb6e15 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -14,7 +14,7 @@ build-mr-cic-eth: extends: - .cic_eth_variables - .cic_eth_changes_target - - .py_build_merge_request + - .py_build_target_dev test-mr-cic-eth: stage: test diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index 4241486b..3f4dd94c 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -19,17 +19,18 @@ variables: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: always -# .py_build_target_test: -# stage: build -# variables: -# CI_DEBUG_TRACE: "true" -# script: -# - mkdir -p /kaniko/.docker -# - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" -# - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target test --tarPath $APP_NAME-test-image.tar --destination $CI_REGISTRY_IMAGE/$APP_NAME-test:latest -# rules: -# - if: $CI_PIPELINE_SOURCE == "merge_request_event" -# when: always +.py_build_target_dev: + stage: build + variables: + CI_DEBUG_TRACE: "true" + IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA + script: + - mkdir -p /kaniko/.docker + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json" + - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target dev --tarPath $APP_NAME-test-image.tar --destination $IMAGE_TAG + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: always .py_build_push: stage: build