From 4c6ebfe6935a5954fdb5ec7347b64eb6e3f1e855 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Jun 2022 11:39:07 +0100 Subject: [PATCH 01/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] =?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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] =?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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] =?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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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/87] 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 bb83366dc4b5cd26bd5c637040963f8bb14e1808 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Sep 2022 12:54:05 +0100 Subject: [PATCH 69/87] Updating with CR --- .../examples/request7_TrafficPolicyObject.xml | 65 +++++++++++++------ 103120/schema/ts_103120_Task.xsd | 14 +++- 103120/schema/ts_103120_TrafficPolicy.xsd | 43 +++++++----- 3 files changed, 86 insertions(+), 36 deletions(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index b41df87..5e4fbd0 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -1,5 +1,5 @@ - +
XX @@ -22,32 +22,59 @@ 0 + + + f69eb93b-a85b-4ff7-abaa-6f3aead286d5 + XX + ACTOR01 + + + + + 203.0.113.0/24 + + + + + + ETSI + PolicyAction + PDSR + + + + + + 1 - 7dbbc880-8750-4d3c-abe7-ea4a17646045 + 55e25c0a-787b-4049-b7fb-518a13a9483b XX ACTOR01 - - 1 - + Template Rule 1 + + 1 - - ETSI - PolicyAction - PDSR - - - - - 203.0.113.0/24 - - - - - + f69eb93b-a85b-4ff7-abaa-6f3aead286d5 + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + 1 + f69eb93b-a85b-4ff7-abaa-6f3aead286d5 + + + + + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index 4459cf9..3aeda58 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -27,8 +27,9 @@ - + + @@ -177,4 +178,15 @@ + + + + + + + + + + + diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 76c39d0..91a5028 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -7,24 +7,39 @@ - + + - + - + - + - - + - + + + + + + + + + + + + + + + + @@ -32,15 +47,11 @@ - - - + + + + + - - - - - - -- GitLab From f013e2e670ae99b231535428eb16b37c59f17165 Mon Sep 17 00:00:00 2001 From: ashtont Date: Tue, 20 Sep 2022 07:24:07 +0000 Subject: [PATCH 70/87] Update ts_103120_TrafficPolicy.xsd Dest to Destination as per Lukes comment (Thanks!) --- 103120/schema/ts_103120_TrafficPolicy.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/ts_103120_TrafficPolicy.xsd b/103120/schema/ts_103120_TrafficPolicy.xsd index 91a5028..43fecff 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -49,8 +49,8 @@ - - + + -- GitLab From 337ce2ae426410a493efa0d5a7203162243b8059 Mon Sep 17 00:00:00 2001 From: ashtont Date: Tue, 20 Sep 2022 08:43:20 +0000 Subject: [PATCH 71/87] Update ts_103120_Task.xsd - Fixed white space --- 103120/schema/ts_103120_Task.xsd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index 3aeda58..3fd14f4 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -29,7 +29,7 @@ - + @@ -178,15 +178,15 @@ - - - - - - - - - - - + + + + + + + + + + + -- GitLab From a222cf8835fa2d164e900396a08218231dd876ce Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 21 Sep 2022 07:32:27 +0000 Subject: [PATCH 72/87] 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 43fecff..1bdc8b3 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -36,7 +36,7 @@ - + -- GitLab From 42c947fec2ad351d7b6e03756c508eaaaf82e5c6 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 21 Sep 2022 07:32:34 +0000 Subject: [PATCH 73/87] 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 1bdc8b3..4f81af0 100644 --- a/103120/schema/ts_103120_TrafficPolicy.xsd +++ b/103120/schema/ts_103120_TrafficPolicy.xsd @@ -15,7 +15,7 @@ - + -- GitLab From 24a1692f169e311aa27cda8768235217e1258f55 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 21 Sep 2022 07:33:33 +0000 Subject: [PATCH 74/87] Apply 1 suggestion(s) to 1 file(s) --- 103120/examples/request7_TrafficPolicyObject.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index 5e4fbd0..d6b4e34 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -66,7 +66,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - + 1 f69eb93b-a85b-4ff7-abaa-6f3aead286d5 -- GitLab From b797e5cbcc0cb45dda17f62d2985955cbc5f87e8 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 21 Sep 2022 07:33:40 +0000 Subject: [PATCH 75/87] Apply 1 suggestion(s) to 1 file(s) --- 103120/examples/request7_TrafficPolicyObject.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index d6b4e34..e4d1432 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -71,7 +71,7 @@ 1 f69eb93b-a85b-4ff7-abaa-6f3aead286d5 - + -- GitLab From a395c8ffb235002e59c6daddcccf787c79d0cff6 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 21 Sep 2022 07:33:47 +0000 Subject: [PATCH 76/87] Apply 1 suggestion(s) to 1 file(s) --- 103120/schema/ts_103120_Task.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index 3fd14f4..7158bf9 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -29,7 +29,7 @@ - + -- GitLab From 50247f334688202aa7fd90518ab4a8fafc019831 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 22 Sep 2022 14:49:34 +0000 Subject: [PATCH 77/87] TS 102 657 CR0141 - Enhancement related to Edge Computing in TS 102 657 --- 102657/RDMessage.asn | 170 +++++++++++++++++++++++++++++++++++++++ 102657/RDMessage.xsd | 185 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 355 insertions(+) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index f3d98eb..a2032d6 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -2269,6 +2269,176 @@ NetworkAccessRecord::= CHOICE ... } + +EdgeComputingRecord ::= CHOICE +{ + edgeComputingSubscriber [1] EdgeComputingSubscriber, + edgeComputingApplicationBillingDetails [2] EdgeComputingApplicationBillingDetails, + edgeComputingApplicationUsage [3] EdgeComputingApplicationUsage, + edgeComputingDevice [4] EdgeComputingDevice +} + +-- ============================== +-- Definitions of Edge Computing Subscriber Data +-- ============================== + +EdgeComputingSubscriber ::= SEQUENCE +{ + subscriberID [1] EdgeComputingSubscriberID OPTIONAL, + -- unique identifier for this subscriber, i.e., EECID + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + -- generic personal information about this subscriber + edgeComputingSubscriberInfo [3] UTF8String OPTIONAL, + subscribedEdgeComputingApplications [4] SEQUENCE OF SubscribedEdgeComputingApplications OPTIONAL + -- a subscriber may have more than one edge computing applications listed against them +} + +EdgeComputingSubscriberID ::= UTF8String + -- unique identifier for this subscriber, i.e., EECID + +SubscribedEdgeComputingApplications ::= SEQUENCE +{ + edgeComputingApplicationID [1] UTF8String OPTIONAL, + -- Unique identifier for this application within the edge ASP + providerID [2] UTF8String OPTIONAL, + -- Unique identifier for the edge ASP + timespan [3] TimeSpan OPTIONAL, + -- Start and end data, if applicable, of the subscription + registeredIdentifiers [4] SEQUENCE OF UTF8String OPTIONAL, + -- The set of identifiers registered for this application + edgeComputingApplicationType [5] UTF8String OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, + -- installation address, if different from the registered address + connectionDate [7] GeneralizedTime OPTIONAL, + -- Date the subscriber was actually connected + -- (May differ from the start of subscription) + iMSI [8] IMSI OPTIONAL, + sUPI [9] SUPI OPTIONAL, + gPSI [10] GPSI OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, + -- Edge ASP-specific description of current line status, + -- e.g. "Active", "Ceased", etc. + paymentDetails [12] PaymentDetails OPTIONAL, + subscriptionType [13] SubscriptionType OPTIONAL, + -- Describes the nature of the subscription + deliveryAddress [14] AddressInformation OPTIONAL, + resellerAddress [15] AddressInformation OPTIONAL, + otherAddresses [16] SEQUENCE OF OtherAddress OPTIONAL, + orderTime [17] GeneralizedTime OPTIONAL, + -- Time when the subscribed edge computing application was ordered by the user + allocatedDeviceIDs [18] SEQUENCE OF EdgeComputingDeviceID OPTIONAL, + paymentTransactions [19] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL +} + + +-- ================================= +-- Definitions of Edge Computing Application Usage Data +-- ================================= + +EdgeComputingApplicationUsage ::= SEQUENCE +{ + subscriberID [1] EdgeComputingSubscriberID OPTIONAL, + communicationTime [2] TimeSpan OPTIONAL, + -- Time and duration of the edge computing application session. + octetsSent [3] INTEGER OPTIONAL, + octetsReceived [4] INTEGER OPTIONAL, + reasonCause [5] UTF8String OPTIONAL, + -- cause for application session termination + qualityOfService [6] QualityOfService OPTIONAL, + edgeComputingApplicationID [7] UTF8String OPTIONAL, + providerID [8] UTF8String OPTIONAL, + cdrNumber [9] UTF8String OPTIONAL, -- as per ASP defined format + clientIP [10] IPAddress OPTIONAL, + edgeApplicationServersInfo [11] SEQUENCE OF EdgeApplicationServerInfo +} + +EdgeApplicationServerInfo ::= SEQUENCE +{ + edgeApplicationServerID [1] UTF8String OPTIONAL, + edgeApplicationServerIP [2] IPAddress OPTIONAL, + edgeApplicationServerLocation [3] Location OPTIONAL, + edgeApplicationServerVirtualResources [4] EdgeApplicationServerVirtualResources OPTIONAL, + serviceContinuity [5] BOOLEAN OPTIONAL +} + +EdgeApplicationServerVirtualResources ::= SEQUENCE +{ + meanVirtualCPUUsage [1] REAL OPTIONAL, + meanVirtualMemoryUsage [2] REAL OPTIONAL, + meanVirtualDiskUsage [3] REAL OPTIONAL, + durationStartTime [4] GeneralizedTime OPTIONAL, + durationEndTime [5] GeneralizedTime OPTIONAL +} + +-- ============================== +-- Definitions of Edge Computing Billing Data +-- ============================== + +EdgeComputingApplicationBillingDetails ::= SEQUENCE +{ + subscriberID [1] EdgeComputingSubscriberID OPTIONAL, + edgeComputingApplicationID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] EdgeComputingBillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL, + edgeComputingBillingAddress [6] EdgeComputingBillingAddress OPTIONAL, + copyOfBill [7] SEQUENCE OF File OPTIONAL +} + +EdgeComputingBillingAddress ::= SEQUENCE +{ + addressSuppliedTime [1] GeneralizedTime OPTIONAL, + name [2] PersonName OPTIONAL, + address [3] AddressInformation OPTIONAL +} + +EdgeComputingBillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +EdgeComputingApplicationBillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + edgeComputingTransactionID [6] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + edgeComputingTransactionStatus [7] UTF8String OPTIONAL + -- Status of the transaction (i.e. "declined", "succeeded", etc.) + -- Details to be defined on a national bases +} + +-- ======================= +-- Definitions of Edge Computing Device Data +-- ======================= + +EdgeComputingDevice ::= SEQUENCE +{ + deviceIDType [1] ENUMERATED + -- Type of identifier for telephony device + { + unknown(0), + imei(1), + macAddress(2), + ... + } OPTIONAL, + edgeComputingDeviceID [2] EdgeComputingDeviceID OPTIONAL, + -- Unique identifier for this device according to type of identifier + subscriberID [3] EdgeComputingSubscriberID OPTIONAL + -- Identifier for a known user of this equipment. + -- Usage of this parameter is subject to national legislation. + +} + +EdgeComputingDeviceID ::= OCTET STRING + -- A unique identifier for the edge computing device. For example, the IMEI number + -- of a mobile handset + -- ============================================= -- Definitions of Network Access Subscriber Data -- ============================================= diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 39e5551..caf723b 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -3317,4 +3317,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From d27d777e642494f3289b3f90077a72151059153d Mon Sep 17 00:00:00 2001 From: jaspers Date: Thu, 22 Sep 2022 14:51:59 +0000 Subject: [PATCH 78/87] Update RDMessage.asn --- 102657/RDMessage.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index a2032d6..963c7cd 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version27(27)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version27(27)} -- ====================================== -- Top level definitions for RDHI wrapper -- GitLab From 70175ecd8bb06511ee4f8002141fedcb876caa4e Mon Sep 17 00:00:00 2001 From: jaspers Date: Thu, 22 Sep 2022 14:53:35 +0000 Subject: [PATCH 79/87] Update RDMessage.xsd --- 102657/RDMessage.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index caf723b..8539ed1 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.29.1 -- GitLab From 812b41018b6dbcd9a5e0cd7a0d64bacad5f4512d Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 23 Sep 2022 11:13:17 +0000 Subject: [PATCH 80/87] TS 103 120 CR0027 - Additional fields from discussion --- 103120/schema/ts_103120_Authorisation.xsd | 3 +++ 103120/schema/ts_103120_Task.xsd | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 72e87c0..408c4ad 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -31,6 +31,9 @@ + + + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index 7158bf9..07353ef 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -141,6 +141,7 @@ + @@ -154,6 +155,11 @@ + + + + + -- GitLab From 0875cdb018231cd21c9e60d176ea53aa25459d74 Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 20 Sep 2022 14:55:37 +0000 Subject: [PATCH 81/87] Update 103280/TS_103_280.asn1, 103280/TS_103_280.xsd files --- 103280/TS_103_280.asn1 | 2 ++ 103280/TS_103_280.xsd | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index 68cfe54..e422752 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -91,4 +91,6 @@ GPSINAI ::= NAI NAI ::= UTF8String +IPProtocol ::= INTEGER (0..255) + END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index 3ff4ae1..93a1a09 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -266,4 +266,10 @@ + + + + + + -- GitLab From a689a1988916ed631d65d093a7efad7581e1c379 Mon Sep 17 00:00:00 2001 From: cione Date: Fri, 23 Sep 2022 11:22:11 +0000 Subject: [PATCH 82/87] TS 103 221-1 CR036 - Enhancing Get All Details --- 103221-1/TS_103_221_01.xsd | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index dbfa03c..2d5ef5a 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -97,6 +97,9 @@ + + + @@ -692,6 +695,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 55d71c1b7d7ba9e50a8614fe8fb64c67a2679d45 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 27 Sep 2022 09:02:10 +0100 Subject: [PATCH 83/87] Updating example version numbers --- 103120/examples/mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/request5-Binary-Delivery.xml | 2 +- 103120/examples/request5-XML-Delivery.xml | 2 +- 103120/examples/request6.xml | 2 +- 103120/examples/request6_signed.xml | 2 +- 103120/examples/request7_TrafficPolicyObject.xml | 2 +- 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 2 +- 103120/examples/response6.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index ab1b79e..67dc555 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.11.1 + V1.12.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index 2479534..d38125b 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 582bb6e..fe4b781 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 7168d84..00e43d0 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 9093778..d18f0f6 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 27b7f8a..de740f5 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index 57b627c..5a3b6f2 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request6.xml b/103120/examples/request6.xml index 5ff9ed2..8f51161 100644 --- a/103120/examples/request6.xml +++ b/103120/examples/request6.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2f 2021-10-11T13:37:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request6_signed.xml b/103120/examples/request6_signed.xml index 61bbf43..05ca015 100644 --- a/103120/examples/request6_signed.xml +++ b/103120/examples/request6_signed.xml @@ -11,7 +11,7 @@ 9964584e-c1a5-4ffa-b949-d9da504c4efb 2021-06-25T12:00:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/request7_TrafficPolicyObject.xml b/103120/examples/request7_TrafficPolicyObject.xml index e4d1432..38d48c1 100644 --- a/103120/examples/request7_TrafficPolicyObject.xml +++ b/103120/examples/request7_TrafficPolicyObject.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaa8eb 2022-07-01T12:00:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index 7a989b9..89c64f0 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index a08f8d6..cd2c668 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 184967b..3b87087 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 3c9f482..4840c73 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 54572b3..5732533 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.11.1 + V1.12.1 XX v1.0 diff --git a/103120/examples/response6.xml b/103120/examples/response6.xml index f5ab209..12325ea 100644 --- a/103120/examples/response6.xml +++ b/103120/examples/response6.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2f 2021-10-11T13:37:01.000000Z - V1.11.1 + V1.12.1 XX v1.0 -- GitLab From 818fac80698f3f6991749b26ac6748a1d7dc4ce6 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 27 Sep 2022 09:22:19 +0100 Subject: [PATCH 84/87] Making dictionary entries consistent --- .../ts_103120_ETSIDictionaryDefinitions.xml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index d571102..45d6343 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -144,6 +144,16 @@ + + ETSI + AuthorisationTypeOfCase + + + NotSpecified + The type of case is not specified + + + ETSI DocumentStatus @@ -228,6 +238,24 @@ + + ETSI + TrafficAction + + + PDSR + Traffic that matches this policy is delivered as Packet Data Summary Reports + + + PDHR + Traffic that matches this policy is delivered as Packet Data Header Reports + + + NotDelivered + Traffic that matches this policy is not delivered + + + ETSI TaskStatus -- GitLab From 2bc18d205bac49945a3cc667b6c08169cab25831 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:45:18 +0100 Subject: [PATCH 85/87] 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 8a6a818e7ad2de24491730e19e15f7a99df4a49a Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:57:45 +0100 Subject: [PATCH 86/87] 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 0bd2a8e2d65dd1340e67f91cbf62644dd929a76f Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Oct 2022 13:59:05 +0100 Subject: [PATCH 87/87] 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