diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index de234ea3..d13e2f5c 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -3,23 +3,28 @@ APP_NAME: cic-eth DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile -.cic_eth_changes_target: - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - changes: - - $CONTEXT/$APP_NAME/**/* - when: always +# .cic_eth_changes_target: +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# changes: +# - $CONTEXT/$APP_NAME/**/* +# when: always build-mr-cic-eth: extends: - .cic_eth_variables - - .cic_eth_changes_target + # - .cic_eth_changes_target - .py_build_target_test + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - apps/cic-eth/**/* + when: always + test-mr-cic-eth: extends: - .cic_eth_variables - - .cic_eth_changes_target stage: test image: $IMAGE_TAG_BASE script: @@ -30,4 +35,3 @@ test-mr-cic-eth: build-push-cic-eth: extends: - .py_build_push - - .cic_eth_variables diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index 56560548..c1d7d9f9 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -26,9 +26,7 @@ variables: - 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 --destination $IMAGE_TAG_BASE - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - when: always + .py_build_push: stage: build