From 648c9b0697608db1bf58d45ba0960747295b5f0d Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:45:18 +0100 Subject: [PATCH 1/4] Adding yaml changes --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 123aa43..cd1647c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,17 @@ workflow: - if: $CI_COMMIT_BRANCH stages: + - preflight - check - build +preflight: + image: "forge.etsi.org:5050/li/trial/forgelib" + stage: preflight + interruptible: true + script: + - echo "Hello world" + process_asn: image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest" stage: check -- GitLab From a9421dcbb23f0d5ee26e5d2fb408518454bfbbd9 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:57:45 +0100 Subject: [PATCH 2/4] YUpdating containers --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd1647c..a73a7ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ stages: - build preflight: - image: "forge.etsi.org:5050/li/trial/forgelib" + image: "forge.etsi.org:5050/li/schemas-definitions/forgelib" stage: preflight interruptible: true script: @@ -32,7 +32,7 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - image: "forge.etsi.org:5050/li/trial/changemarks" + image: "forge.etsi.org:5050/li/schemas-definitions/forgelib" stage: build interruptible: true rules: -- GitLab From b785046a076fc1ff4d6ecd008d01ab954266f643 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:59:05 +0100 Subject: [PATCH 3/4] Omit preflight from non-MR events! --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a73a7ba..f435458 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,8 @@ stages: preflight: image: "forge.etsi.org:5050/li/schemas-definitions/forgelib" stage: preflight + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' interruptible: true script: - echo "Hello world" -- GitLab From 68bdebba4b5ec1135648d680dfba71d66284f7ec Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 14:15:19 +0100 Subject: [PATCH 4/4] Plumbing in new forgelib command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f435458..73272b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ preflight: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' interruptible: true script: - - echo "Hello world" + - forgelib-preflight https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_MERGE_REQUEST_IID process_asn: image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest" -- GitLab