diff --git a/apps/cic-eth/.gitlab-ci.yml b/apps/cic-eth/.gitlab-ci.yml index 4b79713d..f81caf23 100644 --- a/apps/cic-eth/.gitlab-ci.yml +++ b/apps/cic-eth/.gitlab-ci.yml @@ -14,8 +14,8 @@ build-mr-unittest-cic-eth: - .py_build_unittest_merge_request rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - changes: - - $CONTEXT/$APP_NAME/**/* + # changes: + # - $CONTEXT/$APP_NAME/**/* when: always test-mr-unittest-cic-eth: @@ -24,8 +24,8 @@ test-mr-unittest-cic-eth: - .py_unittest_merge_request rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - changes: - - $CONTEXT/$APP_NAME/**/* + # changes: + # - $CONTEXT/$APP_NAME/**/* when: always diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index d4ccc6ac..e195f5c7 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -22,26 +22,20 @@ variables: stage: build variables: CI_DEBUG_TRACE: "true" - artifacts: - paths: - - $APP_NAME-test-image.tar - expire_in: 1 day - when: on_success 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 --no-push --destination $CI_REGISTRY_IMAGE/$APP_NAME:latest + - /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_unittest_merge_request: - image: docker:latest stage: test - script: - - docker load -i $APP_NAME-test-image.tar - - docker images + image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest + script: + - pytest rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: always