From 9ac05f338b85c58ae748af596930ad6cbfcdacd0 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 15 May 2023 23:04:17 +0200 Subject: [PATCH] =?UTF-8?q?S=C3=A9pares=20le=20set=20de=20test=20missing?= =?UTF-8?q?=5Ftag=5Fset=20dans=20une=20configuration=20s=C3=A9par=C3=A9e.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab/.gitlab-ci.yml | 37 +++---------------------------------- .gitlab/missing_tag_set.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 .gitlab/missing_tag_set.yml diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 19c4633..2f37bb2 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -1,4 +1,6 @@ -include: .gitlab/valid_set.yml +include: + - .gitlab/valid_set.yml + - .gitlab/missing_tag_set.yml stages: - Manifest @@ -34,11 +36,6 @@ variables: when: on_success expire_in: "1 hour" -manifest-job/missing_tag_set: - variables: - PACKAGE_NAME: "missing_tag_set" - extends: .manifest-job - .test-job: stage: Test image: python:latest @@ -52,13 +49,6 @@ manifest-job/missing_tag_set: - python -m pytest src/test_images.py --tb=line -rA --color=yes allow_failure: true -test-images-job/missing_tag_set: - needs: - - manifest-job/missing_tag_set - variables: - PACKAGE_NAME: "missing_tag_set" - extends: .test-job - # 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: stage: Bundle @@ -78,13 +68,6 @@ test-images-job/missing_tag_set: when: on_success expire_in: "1 hour" -bundle-job/missing_tag_set: - needs: - - manifest-job/missing_tag_set - variables: - PACKAGE_NAME: "missing_tag_set" - extends: .bundle-job - .upload-job: stage: Distribute image: curlimages/curl:latest @@ -100,13 +83,6 @@ bundle-job/missing_tag_set: --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \ --upload-file ${PACKAGE_NAME}.zip "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip?select=package_file" -upload-job/missing_tag_set: - needs: - - bundle-job/missing_tag_set - variables: - PACKAGE_NAME: "missing_tag_set" - extends: .upload-job - .release-job: stage: Release image: registry.gitlab.com/gitlab-org/release-cli:latest @@ -127,10 +103,3 @@ upload-job/missing_tag_set: links: - name: ${PACKAGE_NAME} url: "${PACKAGE_REGISTRY_URL}/${PACKAGE_NAME}.zip" - -release-job/missing_tag_set: - needs: - - upload-job/missing_tag_set - variables: - PACKAGE_NAME: "missing_tag_set" - extends: .release-job diff --git a/.gitlab/missing_tag_set.yml b/.gitlab/missing_tag_set.yml new file mode 100644 index 0000000..f230554 --- /dev/null +++ b/.gitlab/missing_tag_set.yml @@ -0,0 +1,32 @@ +manifest-job/missing_tag_set: + variables: + PACKAGE_NAME: "missing_tag_set" + extends: .manifest-job + +test-images-job/missing_tag_set: + needs: + - manifest-job/missing_tag_set + variables: + PACKAGE_NAME: "missing_tag_set" + extends: .test-job + +bundle-job/missing_tag_set: + needs: + - manifest-job/missing_tag_set + variables: + PACKAGE_NAME: "missing_tag_set" + extends: .bundle-job + +upload-job/missing_tag_set: + needs: + - bundle-job/missing_tag_set + variables: + PACKAGE_NAME: "missing_tag_set" + extends: .upload-job + +release-job/missing_tag_set: + needs: + - upload-job/missing_tag_set + variables: + PACKAGE_NAME: "missing_tag_set" + extends: .release-job