diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 8f80f8d..dd42fb9 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -37,6 +37,11 @@ manifest-job/valid_set: PACKAGE_NAME: "valid_set" <<: *manifest +manifest-job/missing_tag_set: + variables: + PACKAGE_NAME: "missing_tag_set" + <<: *manifest + .test-images-job: &test-images stage: Test image: python:latest @@ -47,15 +52,19 @@ manifest-job/valid_set: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* script: - pip install -U pytest pillow iteration_utilities - - python -m pytest src/test_images.py --tb=line -rA + - python -m pytest src/test_images.py --tb=line -rA --color=yes allow_failure: true test-images-job/valid_set: + needs: + - manifest-job/valid_set variables: PACKAGE_NAME: "valid_set" <<: *test-images test-images-job/missing_tag_set: + needs: + - manifest-job/missing_tag_set variables: PACKAGE_NAME: "missing_tag_set" <<: *test-images @@ -67,6 +76,7 @@ test-images-job/missing_tag_set: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* @@ -79,11 +89,15 @@ test-images-job/missing_tag_set: expire_in: "1 hour" bundle-job/valid_set: + needs: + - manifest-job/valid_set variables: PACKAGE_NAME: "valid_set" <<: *bundle bundle-job/missing_tag_set: + needs: + - manifest-job/missing_tag_set variables: PACKAGE_NAME: "missing_tag_set" <<: *bundle