From 4c6ebfe6935a5954fdb5ec7347b64eb6e3f1e855 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:39:07 +0100 Subject: [PATCH 01/68] Adding artefact job --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df3..31fd023 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,13 @@ +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" @@ -15,3 +23,22 @@ process_xsd: script: - python3 testing/xsd_process.py +generate_artefacts: + image: "forge.etsi.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 + - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + artifacts: + untracked: true + paths: + - "*.docx" + expire_in: 30 days -- GitLab From e86388b8dda02eae7b689979778a0a5ff2728f79 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:57:25 +0100 Subject: [PATCH 02/68] Changing images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31fd023..03e857d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,14 @@ stages: - build process_asn: - image: "mcanterb/asn1test:latest" + image: "forge.etsi.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.etsi.org:5050/li/schemas-definitions/asn1test:latest" stage: check interruptible: true script: -- GitLab From d5d00d38e9f5cc0f0bedd90e29dc38b4c3f35fa6 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:58:34 +0100 Subject: [PATCH 03/68] Fixing image references --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03e857d..b9b4816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ process_asn: - python3 testing/asn_process.py process_xsd: - image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest" + image: "forge.etsi.org:5050/li/schemas-definitions/xsdtest:latest" stage: check interruptible: true script: -- GitLab From 0da240f81834ae0cf373edb90ab7c85f954b7919 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 16 Jun 2022 14:20:23 +0000 Subject: [PATCH 04/68] Update ts_103120_Core.xsd - dummy change to test CI/CD --- 103120/schema/ts_103120_Core.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 1105f2c..f35247b 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,4 +1,5 @@ + Date: Thu, 16 Jun 2022 14:22:17 +0000 Subject: [PATCH 05/68] Update LI-PS-PDU.asn - dummy change to test CI/CD --- 102232-1/LI-PS-PDU.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 714ecf8..0135ec2 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,6 +1,8 @@ LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)} +-- Dummy change to test CI/CD, remove before merge + DEFINITIONS IMPLICIT TAGS ::= BEGIN -- GitLab From 32df5ebeca3d1c7fa5d9cc421a4160908d45436e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:33:44 +0100 Subject: [PATCH 06/68] Attempting to change artefact name --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9b4816..cbd241d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,4 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" + name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" expire_in: 30 days -- GitLab From 7e6f27d1b285beabdadb2321449f83707f9c472e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:36:05 +0100 Subject: [PATCH 07/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd241d..831854e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,5 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" + name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" expire_in: 30 days -- GitLab From 1d845a026c36b07711668339188659ab06fd1523 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:48:53 +0100 Subject: [PATCH 08/68] Attempting to change artefact name --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 831854e..e9b2770 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,8 @@ generate_artefacts: image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true + variables: + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: @@ -41,5 +43,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + name: "${ARTEFACT_NAME}" expire_in: 30 days -- GitLab From 0ac74f9e88cf09de17c25a42bfbc6f62681dddd4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:50:30 +0100 Subject: [PATCH 09/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9b2770..517d836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ generate_artefacts: stage: build interruptible: true variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From 9f1c9d63fed6418daf2021fd41af0088ece1cee3 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:52:50 +0100 Subject: [PATCH 10/68] Checking output --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 517d836..342fa81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,8 @@ generate_artefacts: - 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 -- GitLab From f19724c959c0dbf2df497c17a9848f6edb52d1cc Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:57:30 +0100 Subject: [PATCH 11/68] =?UTF-8?q?Trying=20again=C2=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 342fa81..6ab40c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,11 +24,11 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: + before_script: + - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true - variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From 68dbe431d487cf24c419a20f9131c4875aadb793 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:00:00 +0100 Subject: [PATCH 12/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ab40c8..1c3812b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,5 +45,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${ARTEFACT_NAME}" + name: $ARTEFACT_NAME expire_in: 30 days -- GitLab From 089fac59aed3609813c0e4320fa01fa516f7d117 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:01:45 +0100 Subject: [PATCH 13/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c3812b..0a69467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - before_script: + variables: - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build -- GitLab From ad0df6abc5700ec9828fe71496ad02ebf87a9e28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:02:53 +0100 Subject: [PATCH 14/68] Trying again --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a69467..0610b96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - variables: - - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true @@ -41,6 +39,8 @@ generate_artefacts: - 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 + variables: + ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: -- GitLab From 14c88b048a7871b9128d52da579e3289cc18a600 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:05:33 +0100 Subject: [PATCH 15/68] Switching to using title --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0610b96..123aa43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,11 +39,9 @@ generate_artefacts: - 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 - variables: - ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: - "*.docx" - name: $ARTEFACT_NAME + name: $CI_MERGE_REQUEST_TITLE expire_in: 30 days -- GitLab From 234eb417e6da31673584910942d4625c67a2b4af Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:39:07 +0100 Subject: [PATCH 16/68] Adding artefact job --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df3..31fd023 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,13 @@ +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" @@ -15,3 +23,22 @@ process_xsd: script: - python3 testing/xsd_process.py +generate_artefacts: + image: "forge.etsi.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 + - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + artifacts: + untracked: true + paths: + - "*.docx" + expire_in: 30 days -- GitLab From fea181cca30c89cb7a536ae43b9e143b12573b94 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:57:25 +0100 Subject: [PATCH 17/68] Changing images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31fd023..03e857d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,14 @@ stages: - build process_asn: - image: "mcanterb/asn1test:latest" + image: "forge.etsi.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.etsi.org:5050/li/schemas-definitions/asn1test:latest" stage: check interruptible: true script: -- GitLab From 7bbe9fd3fa6d68a472c1c058476136d087939fa8 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:58:34 +0100 Subject: [PATCH 18/68] Fixing image references --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03e857d..b9b4816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ process_asn: - python3 testing/asn_process.py process_xsd: - image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest" + image: "forge.etsi.org:5050/li/schemas-definitions/xsdtest:latest" stage: check interruptible: true script: -- GitLab From 88a787a12338b060c8c6bc953caf9648d45ba0b1 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 16 Jun 2022 14:20:23 +0000 Subject: [PATCH 19/68] Update ts_103120_Core.xsd - dummy change to test CI/CD --- 103120/schema/ts_103120_Core.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 1105f2c..f35247b 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,4 +1,5 @@ + Date: Thu, 16 Jun 2022 14:22:17 +0000 Subject: [PATCH 20/68] Update LI-PS-PDU.asn - dummy change to test CI/CD --- 102232-1/LI-PS-PDU.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 002e228..4e6ac95 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,6 +1,8 @@ LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)} +-- Dummy change to test CI/CD, remove before merge + DEFINITIONS IMPLICIT TAGS ::= BEGIN -- GitLab From 84399e410763104a54ac3349e6530de7f51fcae9 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:33:44 +0100 Subject: [PATCH 21/68] Attempting to change artefact name --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9b4816..cbd241d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,4 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" + name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" expire_in: 30 days -- GitLab From f3974a1c45e847e5d16c5586e2127760e2e8e6d0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:36:05 +0100 Subject: [PATCH 22/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd241d..831854e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,5 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" + name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" expire_in: 30 days -- GitLab From d58cd4136d0cada5fa3ae144ada475277b41cd2e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:48:53 +0100 Subject: [PATCH 23/68] Attempting to change artefact name --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 831854e..e9b2770 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,8 @@ generate_artefacts: image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true + variables: + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: @@ -41,5 +43,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + name: "${ARTEFACT_NAME}" expire_in: 30 days -- GitLab From 6ec8c70c383be42299a00e8b9c149f4a48562abf Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:50:30 +0100 Subject: [PATCH 24/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9b2770..517d836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ generate_artefacts: stage: build interruptible: true variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From a5c6c73f0917e55d337b909608abd228ae2b823c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:52:50 +0100 Subject: [PATCH 25/68] Checking output --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 517d836..342fa81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,8 @@ generate_artefacts: - 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 -- GitLab From 5448bb354c6840549f6906e75becd227118065ff Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:57:30 +0100 Subject: [PATCH 26/68] =?UTF-8?q?Trying=20again=C2=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 342fa81..6ab40c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,11 +24,11 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: + before_script: + - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true - variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From 7f521636801e3bb06180be2e69013732e6412732 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:00:00 +0100 Subject: [PATCH 27/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ab40c8..1c3812b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,5 +45,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${ARTEFACT_NAME}" + name: $ARTEFACT_NAME expire_in: 30 days -- GitLab From cc231ca0c3a69d88bbdebc615082e5754f7d6082 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:01:45 +0100 Subject: [PATCH 28/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c3812b..0a69467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - before_script: + variables: - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build -- GitLab From fd95ee2e7c10d5a8668c099ee88599ff584d5cbe Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:02:53 +0100 Subject: [PATCH 29/68] Trying again --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a69467..0610b96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - variables: - - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true @@ -41,6 +39,8 @@ generate_artefacts: - 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 + variables: + ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: -- GitLab From 99f6f46e8fa11c1ae6048c26c394338b60704444 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:05:33 +0100 Subject: [PATCH 30/68] Switching to using title --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0610b96..123aa43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,11 +39,9 @@ generate_artefacts: - 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 - variables: - ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: - "*.docx" - name: $ARTEFACT_NAME + name: $CI_MERGE_REQUEST_TITLE expire_in: 30 days -- GitLab From 49253ba76b4bfe4402c939ab4f7f368824dddfa4 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 29 Jul 2022 12:53:38 +0100 Subject: [PATCH 31/68] First draft --- .../examples/request7_TrafficPolicyObject.xml | 55 +++++++++++++++++++ 103120/schema/ts_103120_TrafficPolicy.xsd | 50 +++++++++++++++++ testing/xsd_compile_targets.json | 1 + 3 files changed, 106 insertions(+) create mode 100644 103120/examples/request7_TrafficPolicyObject.xml create mode 100644 103120/schema/ts_103120_TrafficPolicy.xsd diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml new file mode 100644 index 0000000..3b2b466 --- /dev/null +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -0,0 +1,55 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaa8eb + 2022-07-01T12:00:00.000000Z + + V1.11.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + ACTOR01 + + + 1 + + + + + 203.0.113.0/24 + + + + + + ETSI + PolicyAction + PDSR + + + + + + + + + + diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd new file mode 100644 index 0000000..ab19a94 --- /dev/null +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index 69ad1b5..a1bde12 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -38,6 +38,7 @@ "103120/schema/ts_103120_Document.xsd", "103120/schema/ts_103120_Notification.xsd", "103120/schema/ts_103120_Task.xsd", + "103120/schema/ts_103120_TrafficPolicy.xsd", "103280/TS_103_280.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd", "103120/examples/FooServiceSchema.xsd" -- GitLab From ae0d4704cdc738d08ce57e5d1ee293a425855b1b Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:48:01 +0000 Subject: [PATCH 32/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index ab19a94..58cac3f 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -7,26 +7,27 @@ - + - + - + - + - - + - + - + + + @@ -47,4 +48,4 @@ - \ No newline at end of file + -- GitLab From 7e458239033ddcf66b85e47a405ca530ae0b1e1b Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:56:19 +0000 Subject: [PATCH 33/68] Update 103120/examples/request7_TrafficPolicyObject.xml --- .../examples/request7_TrafficPolicyObject.xml | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 3b2b466..f027ab9 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -27,25 +27,28 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX ACTOR01 - - + + 1 - - - - - 203.0.113.0/24 - - - - - - ETSI - PolicyAction - PDSR - - - + + 1 + + ETSI + PolicyAction + PDSR + + + + + + 203.0.113.0/24 + + + + + + + -- GitLab From 7f8678cc2174ade1e33806afd8d9889e49af9b93 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:58:37 +0000 Subject: [PATCH 34/68] Update 103120/examples/request7_TrafficPolicyObject.xml --- 103120/examples/request7_TrafficPolicyObject.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index f027ab9..3559e6e 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -38,13 +38,11 @@ PDSR - - - - 203.0.113.0/24 - - - + + + 203.0.113.0/24 + + -- GitLab From 95ceb90d250dbce867075189045b19a8b17a24d8 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:39:07 +0100 Subject: [PATCH 35/68] Adding artefact job --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4e3df3..31fd023 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,13 @@ +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" @@ -15,3 +23,22 @@ process_xsd: script: - python3 testing/xsd_process.py +generate_artefacts: + image: "forge.etsi.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 + - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + artifacts: + untracked: true + paths: + - "*.docx" + expire_in: 30 days -- GitLab From 96d9b9d8564d276dc616f82da7cbc1058f48e006 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:57:25 +0100 Subject: [PATCH 36/68] Changing images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31fd023..03e857d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,14 @@ stages: - build process_asn: - image: "mcanterb/asn1test:latest" + image: "forge.etsi.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.etsi.org:5050/li/schemas-definitions/asn1test:latest" stage: check interruptible: true script: -- GitLab From 830f53f90faff3cc4d50f739e70c184d931b2b89 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:58:34 +0100 Subject: [PATCH 37/68] Fixing image references --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03e857d..b9b4816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ process_asn: - python3 testing/asn_process.py process_xsd: - image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest" + image: "forge.etsi.org:5050/li/schemas-definitions/xsdtest:latest" stage: check interruptible: true script: -- GitLab From 36c5a2ff8ee781e86861568b2e98427b3c4e15b4 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 16 Jun 2022 14:20:23 +0000 Subject: [PATCH 38/68] Update ts_103120_Core.xsd - dummy change to test CI/CD --- 103120/schema/ts_103120_Core.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 1105f2c..f35247b 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,4 +1,5 @@ + Date: Thu, 16 Jun 2022 14:22:17 +0000 Subject: [PATCH 39/68] Update LI-PS-PDU.asn - dummy change to test CI/CD --- 102232-1/LI-PS-PDU.asn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 002e228..4e6ac95 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,6 +1,8 @@ LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)} +-- Dummy change to test CI/CD, remove before merge + DEFINITIONS IMPLICIT TAGS ::= BEGIN -- GitLab From a1568c843b9dd012f433b8bf387a3aacb150e1ac Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:33:44 +0100 Subject: [PATCH 40/68] Attempting to change artefact name --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9b4816..cbd241d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,4 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" + name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" expire_in: 30 days -- GitLab From d0de9f9516c8a2599e5cde4dacb02cc944a56494 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:36:05 +0100 Subject: [PATCH 41/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd241d..831854e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,5 +41,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" + name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" expire_in: 30 days -- GitLab From 6f80205b01f0b0e940c98b24c64c4ab574141d8c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:48:53 +0100 Subject: [PATCH 42/68] Attempting to change artefact name --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 831854e..e9b2770 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,8 @@ generate_artefacts: image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true + variables: + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: @@ -41,5 +43,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + name: "${ARTEFACT_NAME}" expire_in: 30 days -- GitLab From 7352c5061a99367defff159e5ee261fcc7564916 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:50:30 +0100 Subject: [PATCH 43/68] Attempting to change artefact name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9b2770..517d836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ generate_artefacts: stage: build interruptible: true variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" | tr / _ ) + ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From 92c8ed45edcf5f3c3dcbb04de1ab90b7bc190a28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:52:50 +0100 Subject: [PATCH 44/68] Checking output --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 517d836..342fa81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,8 @@ generate_artefacts: - 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 -- GitLab From c6de1eb9f88644555fd4a7638e69e34bce1da9fe Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 13:57:30 +0100 Subject: [PATCH 45/68] =?UTF-8?q?Trying=20again=C2=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 342fa81..6ab40c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,11 +24,11 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: + before_script: + - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true - variables: - ARTEFACT_NAME: $( echo "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ) rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' script: -- GitLab From d3ab61a009909c2ed62c1975f5a7539cbeb05534 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:00:00 +0100 Subject: [PATCH 46/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ab40c8..1c3812b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,5 +45,5 @@ generate_artefacts: untracked: true paths: - "*.docx" - name: "${ARTEFACT_NAME}" + name: $ARTEFACT_NAME expire_in: 30 days -- GitLab From 47ddd13d41309faeb24d43c018e9695a87f015fe Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:01:45 +0100 Subject: [PATCH 47/68] Trying again --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c3812b..0a69467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - before_script: + variables: - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build -- GitLab From f1d6055c78e80cdecdc55ec612f11f625183d473 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:02:53 +0100 Subject: [PATCH 48/68] Trying again --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a69467..0610b96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,6 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - variables: - - ARTEFACT_NAME=$(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) image: "forge.etsi.org:5050/li/trial/changemarks" stage: build interruptible: true @@ -41,6 +39,8 @@ generate_artefacts: - 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 + variables: + ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: -- GitLab From 26c945d0e4d2fde19cbb09f8dfc7819f3eb1be27 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 4 Jul 2022 14:05:33 +0100 Subject: [PATCH 49/68] Switching to using title --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0610b96..123aa43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,11 +39,9 @@ generate_artefacts: - 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 - variables: - ARTEFACT_NAME : $(echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME | tr / _ ) artifacts: untracked: true paths: - "*.docx" - name: $ARTEFACT_NAME + name: $CI_MERGE_REQUEST_TITLE expire_in: 30 days -- GitLab From 71d9aa7c91ebb91efab5fe695cab18fc7308b0c7 Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 15:08:07 +0000 Subject: [PATCH 50/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 58cac3f..5c8ddea 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -37,6 +37,7 @@ + -- GitLab From ec8ddb9be4e4b150965c531f4bf5219b653a5256 Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 15:08:53 +0000 Subject: [PATCH 51/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 5c8ddea..d7ba399 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -37,7 +37,7 @@ - + -- GitLab From b1b9894335295dfbf41d651f69c4b41a7648a1af Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 16:50:11 +0000 Subject: [PATCH 52/68] Update ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 6 ------ 1 file changed, 6 deletions(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index d7ba399..26cdc52 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -14,12 +14,6 @@ - - - - - - -- GitLab From bfd29b0fa512b3b862a891378d9cc1a44d6f4e40 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 11:54:06 +0000 Subject: [PATCH 53/68] Update ts_103120_TrafficPolicy.xsd - IPProtocol commented out until 103 280 change to allow auto validation. --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 26cdc52..32ffc3e 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -31,7 +31,7 @@ - + -- GitLab From c8ce9d0d0773dfdbb82c46faff9bd5970e9f7453 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 18 Aug 2022 12:06:58 +0000 Subject: [PATCH 54/68] Apply 1 suggestion(s) to 1 file(s) --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 32ffc3e..76c39d0 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -31,7 +31,7 @@ - + -- GitLab From e51d70586f8e1e84509c27f7d6217dff4cec6be6 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 12:24:06 +0000 Subject: [PATCH 55/68] Update request7_TrafficPolicyObject.xml --- 103120/examples/request7_TrafficPolicyObject.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 3559e6e..84c29a5 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -28,7 +28,6 @@ XX ACTOR01 - 1 1 @@ -45,7 +44,6 @@ - -- GitLab From e2d07ce0d748490632c3622a6dfd77fa0be14686 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 12:58:19 +0000 Subject: [PATCH 56/68] Update request7_TrafficPolicyObject.xml --- .../examples/request7_TrafficPolicyObject.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 84c29a5..b41df87 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -28,22 +28,22 @@ XX ACTOR01 + 1 + 1 - - 1 - - ETSI - PolicyAction - PDSR - - - - - 203.0.113.0/24 - - - - + + ETSI + PolicyAction + PDSR + + + + + 203.0.113.0/24 + + + + -- GitLab From 96544f04884d136a6d7d14eb79a4c01df4155204 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 23 Aug 2022 08:38:38 +0100 Subject: [PATCH 57/68] Removing dummy changes --- 103120/schema/ts_103120_Core.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index f35247b..1105f2c 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,5 +1,4 @@ - Date: Fri, 29 Jul 2022 12:53:38 +0100 Subject: [PATCH 58/68] First draft --- .../examples/request7_TrafficPolicyObject.xml | 55 +++++++++++++++++++ 103120/schema/ts_103120_TrafficPolicy.xsd | 50 +++++++++++++++++ testing/xsd_compile_targets.json | 1 + 3 files changed, 106 insertions(+) create mode 100644 103120/examples/request7_TrafficPolicyObject.xml create mode 100644 103120/schema/ts_103120_TrafficPolicy.xsd diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml new file mode 100644 index 0000000..3b2b466 --- /dev/null +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -0,0 +1,55 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaa8eb + 2022-07-01T12:00:00.000000Z + + V1.11.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + ACTOR01 + + + 1 + + + + + 203.0.113.0/24 + + + + + + ETSI + PolicyAction + PDSR + + + + + + + + + + diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd new file mode 100644 index 0000000..ab19a94 --- /dev/null +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index 69ad1b5..a1bde12 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -38,6 +38,7 @@ "103120/schema/ts_103120_Document.xsd", "103120/schema/ts_103120_Notification.xsd", "103120/schema/ts_103120_Task.xsd", + "103120/schema/ts_103120_TrafficPolicy.xsd", "103280/TS_103_280.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd", "103120/examples/FooServiceSchema.xsd" -- GitLab From cd615762e6fcb8349bfbbd30236b52e580107479 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:48:01 +0000 Subject: [PATCH 59/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index ab19a94..58cac3f 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -7,26 +7,27 @@ - + - + - + - + - - + - + - + + + @@ -47,4 +48,4 @@ - \ No newline at end of file + -- GitLab From b9e3114d42b1e8cd2d7213734d0612e3db6dee15 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:56:19 +0000 Subject: [PATCH 60/68] Update 103120/examples/request7_TrafficPolicyObject.xml --- .../examples/request7_TrafficPolicyObject.xml | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 3b2b466..f027ab9 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -27,25 +27,28 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX ACTOR01 - - + + 1 - - - - - 203.0.113.0/24 - - - - - - ETSI - PolicyAction - PDSR - - - + + 1 + + ETSI + PolicyAction + PDSR + + + + + + 203.0.113.0/24 + + + + + + + -- GitLab From 3e2c019d0d38030786a42d71f11c1afca522ee32 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 11 Aug 2022 15:58:37 +0000 Subject: [PATCH 61/68] Update 103120/examples/request7_TrafficPolicyObject.xml --- 103120/examples/request7_TrafficPolicyObject.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index f027ab9..3559e6e 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -38,13 +38,11 @@ PDSR - - - - 203.0.113.0/24 - - - + + + 203.0.113.0/24 + + -- GitLab From d333e2e9a9886a550a046eeca02195f6253624e8 Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 15:08:07 +0000 Subject: [PATCH 62/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 58cac3f..5c8ddea 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -37,6 +37,7 @@ + -- GitLab From 5eb8ce55617c4ac5d7fc68d52abe5b57b75bb3eb Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 15:08:53 +0000 Subject: [PATCH 63/68] Update 103120/schema/ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 5c8ddea..d7ba399 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -37,7 +37,7 @@ - + -- GitLab From c1052da91353c2cc606a45b06e02041003523a05 Mon Sep 17 00:00:00 2001 From: ashtont Date: Wed, 17 Aug 2022 16:50:11 +0000 Subject: [PATCH 64/68] Update ts_103120_TrafficPolicy.xsd --- 103120/schema/ts_103120_TrafficPolicy.xsd | 6 ------ 1 file changed, 6 deletions(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index d7ba399..26cdc52 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -14,12 +14,6 @@ - - - - - - -- GitLab From 4db27009a244aeae357a70854d13faf2962b95d8 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 11:54:06 +0000 Subject: [PATCH 65/68] Update ts_103120_TrafficPolicy.xsd - IPProtocol commented out until 103 280 change to allow auto validation. --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 26cdc52..32ffc3e 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -31,7 +31,7 @@ - + -- GitLab From 787aa7ded8bca0677cb73a39b7410c1b38ed23b8 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 18 Aug 2022 12:06:58 +0000 Subject: [PATCH 66/68] Apply 1 suggestion(s) to 1 file(s) --- 103120/schema/ts_103120_TrafficPolicy.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 32ffc3e..76c39d0 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -31,7 +31,7 @@ - + -- GitLab From 47dfd2b92dbac63ed8f89e3506810f04f0f41933 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 12:24:06 +0000 Subject: [PATCH 67/68] Update request7_TrafficPolicyObject.xml --- 103120/examples/request7_TrafficPolicyObject.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 3559e6e..84c29a5 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -28,7 +28,6 @@ XX ACTOR01 - 1 1 @@ -45,7 +44,6 @@ - -- GitLab From 3d12eab3bddf0d73af8bb9bf935c5199f574c350 Mon Sep 17 00:00:00 2001 From: ashtont Date: Thu, 18 Aug 2022 12:58:19 +0000 Subject: [PATCH 68/68] Update request7_TrafficPolicyObject.xml --- .../examples/request7_TrafficPolicyObject.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 84c29a5..b41df87 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -28,22 +28,22 @@ XX ACTOR01 + 1 + 1 - - 1 - - ETSI - PolicyAction - PDSR - - - - - 203.0.113.0/24 - - - - + + ETSI + PolicyAction + PDSR + + + + + 203.0.113.0/24 + + + + -- GitLab