From 45506d0630bdd8e283f9c91d5d0d1068f24f7937 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 5 Jul 2022 11:31:39 +0100 Subject: [PATCH 1/4] Moving to project images and adding artefact generation --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df33..4ebed38e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,47 @@ +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH + stages: - check + - build process_asn: - image: "mcanterb/asn1test:latest" + image: "forge.3gpp.org:5050/li/schemas-definitions/asn1test:latest" stage: check interruptible: true script: - python3 testing/asn_process.py process_xsd: - image: "mcanterb/xsdtest:latest" + image: "forge.3gpp.org:5050/li/schemas-definitions/xsdtest:latest" stage: check interruptible: true script: - python3 testing/xsd_process.py +generate_artefacts: + image: "forge.3gpp.org:5050/li/trial/changemarks" + stage: build + interruptible: true + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + script: + - echo $CI_PROJECT_ID + - echo $CI_PROJECT_NAME + - echo $CI_PROJECT_PATH + - echo $CI_PIPELINE_SOURCE + - echo $CI_OPEN_MERGE_REQUESTS + - echo $CI_MERGE_REQUEST_IID + - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + - echo $ARTEFACT_NAME + - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + artifacts: + untracked: true + paths: + - "*.docx" + name: $CI_MERGE_REQUEST_TITLE + expire_in: 30 days -- GitLab From 4c09dba6b2d5108fad8ba5af7b7066315875634f Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 5 Jul 2022 11:33:08 +0100 Subject: [PATCH 2/4] Correcting image names --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ebed38e..c54d1309 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,21 +10,21 @@ stages: - build process_asn: - image: "forge.3gpp.org:5050/li/schemas-definitions/asn1test:latest" + image: "forge.3gpp.org:5050/sa3/li/asn1test:latest" stage: check interruptible: true script: - python3 testing/asn_process.py process_xsd: - image: "forge.3gpp.org:5050/li/schemas-definitions/xsdtest:latest" + image: "forge.3gpp.org:5050/sa3/li/xsdtest:latest" stage: check interruptible: true script: - python3 testing/xsd_process.py generate_artefacts: - image: "forge.3gpp.org:5050/li/trial/changemarks" + image: "forge.3gpp.org:5050/sa3/li/artefacts:latest" stage: build interruptible: true rules: -- GitLab From 1bf6db7bfa81da2298bc9f1fb35008bcfbda33c5 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 5 Jul 2022 16:20:42 +0100 Subject: [PATCH 3/4] Dummy change --- 33128/r17/TS33128Payloads.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index ad035329..65f53321 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,6 +1,8 @@ TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version4(4)} +-- testing change artefact + DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- GitLab From 6bccf7d5b37f9ce889f2409e8e1b17e66c8767a8 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 15 Jul 2022 13:01:38 +0000 Subject: [PATCH 4/4] Removing test change --- 33128/r17/TS33128Payloads.asn | 2 -- 1 file changed, 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 65f53321..ad035329 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,8 +1,6 @@ TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version4(4)} --- testing change artefact - DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- GitLab