diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml index dbfca295..355d3fdd 100644 --- a/ci_templates/.cic-template.yml +++ b/ci_templates/.cic-template.yml @@ -18,32 +18,32 @@ variables: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: always -# .py_build_unittest_merge_request: -# 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_unittest_merge_request: - stage: test - image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest +.py_build_unittest_merge_request: + stage: build + variables: + CI_DEBUG_TRACE: "true" script: - - ls - - pwd - - env - - cd apps/$APP_NAME/ - - pytest + - 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_unittest_merge_request: +# stage: test +# image: $CI_REGISTRY_IMAGE/$APP_NAME-test:latest +# script: +# - ls +# - pwd +# - env +# - cd apps/$APP_NAME/ +# - pytest +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# when: always + .py_build_push: stage: build variables: