diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 4c24508..93a4787 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -6,39 +6,42 @@ stages: - Release variables: - ENTRY_FOLDER: "test" + ENTRY_FOLDER: "test" # test directory for testing CI/CD, or assets directory for normal operations RELEASE_VERSION: v0.$CI_PIPELINE_IID PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE_NAME}/${RELEASE_VERSION}" # Jobs from here run on Merge Requests as prerequisite for merging. -.gen-manifest-job: &gen-manifest +.manifest-job: &manifest stage: Manifest rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: # TODO: refacto this (as Reference or something else) - - test/${PACKAGE_NAME}/* + - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* script: - echo generating manifest for ${ENTRY_FOLDER}/${PACKAGE_NAME} -gen-manifest-job/valid_set: - variables: - PACKAGE_NAME: "valid_set" - <<: *gen-manifest +# manifest-job/valid_set: +# variables: +# PACKAGE_NAME: "valid_set" +# <<: *gen-manifest -.check-content-job: &check-content +.test-images-job: &test-images stage: Test + image: python:latest rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - ${ENTRY_FOLDER}/${PACKAGE_NAME}/* script: - - echo testing ${ENTRY_FOLDER}/${PACKAGE_NAME} + - pip install -U pytest pillow iteration_utilities + - python -m pytest .gitlab/py_job/test_wpp.py --tb=line -rA --color=yes --code-highlight=yes -q + allow_failure: true -check-content-job/valid_set: +test-images-job/valid_set: variables: PACKAGE_NAME: "valid_set" - <<: *check-content + <<: *test-images # Jobs from here run Merged_results or Push/Merge Commits to the main branch. Tag is created on release so no run with tag creation .bundle-job: &bundle @@ -78,12 +81,12 @@ bundle-job/valid_set: --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ --upload-file ${PACKAGE_NAME}.zip "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip?select=package_file" -# upload-job/valid_set: -# needs: -# - bundle-job/valid_set -# variables: -# PACKAGE_NAME: "valid_set" -# <<: *upload +upload-job/valid_set: + needs: + - bundle-job/valid_set + variables: + PACKAGE_NAME: "valid_set" + <<: *upload .release-job: &release stage: Release @@ -105,9 +108,10 @@ bundle-job/valid_set: links: - name: ${PACKAGE_NAME} url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip" -# release-job/valid_set: -# needs: -# - upload-job/valid_set -# variables: -# PACKAGE_NAME: "valid_set" -# <<: *release + +release-job/valid_set: + needs: + - upload-job/valid_set + variables: + PACKAGE_NAME: "valid_set" + <<: *release diff --git a/test/valid_set/description.md b/test/valid_set/description.md index 40cd5d7..aad958a 100644 --- a/test/valid_set/description.md +++ b/test/valid_set/description.md @@ -1,4 +1,3 @@ # some descriptions Introducting change for testing. -Pipeline still won't trigger.