From 5427698b6bc3174aee5832009f6fba10c299b7b0 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 10:39:46 +0000 Subject: [PATCH 1/9] Attempting CI/CD basline generation --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8263f127..5bb2b523 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,23 @@ workflow: - if: $CI_COMMIT_BRANCH stages: + - markdown_test - preflight - compile - lint - build +# ----------------------------------------------------------- +# Markdown + +preflight: + stage: markdown_test + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + interruptible: true + script: + - 104196/publish.sh 001 104196/ts_spec_template.docx 104196 104196/ts_cover_skeleton.docx TS + # ----------------------------------------------------------- # Preflight -- GitLab From 3eed3ba9746c0ee2956c4a9c374b4e7e005c2a94 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 10:39:46 +0000 Subject: [PATCH 2/9] Attempting CI/CD basline generation --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fc5044f..7b5f37df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,23 @@ workflow: - if: $CI_COMMIT_BRANCH stages: + - markdown_test - preflight - compile - lint - build +# ----------------------------------------------------------- +# Markdown + +preflight: + stage: markdown_test + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + interruptible: true + script: + - 104196/publish.sh 001 104196/ts_spec_template.docx 104196 104196/ts_cover_skeleton.docx TS + # ----------------------------------------------------------- # Preflight -- GitLab From f6c861dedcb208d72cd275eb50cd47f1eb625f0e Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 10:46:58 +0000 Subject: [PATCH 3/9] CI/CD --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b5f37df..4f214f5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ stages: # ----------------------------------------------------------- # Markdown -preflight: +markdown: stage: markdown_test rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' -- GitLab From 10796e6ff414287fa552a76405317646fc39c780 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 10:48:17 +0000 Subject: [PATCH 4/9] Rename --- 104196/{104196.md => TS_104196.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 104196/{104196.md => TS_104196.md} (100%) diff --git a/104196/104196.md b/104196/TS_104196.md similarity index 100% rename from 104196/104196.md rename to 104196/TS_104196.md -- GitLab From 38bc461010953f0a90033df63ded185827ed5778 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 11:23:13 +0000 Subject: [PATCH 5/9] Automation? --- .gitlab-ci.yml | 3 ++- 104196/TS_104196.md | 42 ++++++++++++++++++++++++++++-------------- 104196/publish.sh | 20 ++++++++++---------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f214f5f..9cedeae6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,8 @@ markdown: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' interruptible: true script: - - 104196/publish.sh 001 104196/ts_spec_template.docx 104196 104196/ts_cover_skeleton.docx TS + - cd 104196 + - ./publish.sh 001 ts_spec_template.docx 104196 ts_cover_skeleton.docx TS # ----------------------------------------------------------- diff --git a/104196/TS_104196.md b/104196/TS_104196.md index 6ce41db0..cc7e261f 100644 --- a/104196/TS_104196.md +++ b/104196/TS_104196.md @@ -1,22 +1,25 @@ ---- -Title: Considerations for using portals to support requests from
Authorized Organisations -Spec Number: TR 104 196 -Version: v0.6.0 -Date: 2025-11 -keywords: Markdown, Gitlab -Copyright Year: 2025 -Long ISG Name: Technical Committee Lawful Interception -Short ISG Name: TC LI ---- + + + + + + + + + + + + # Intellectual Property Rights Essential patents @@ -108,9 +111,8 @@ Adoption of the present document does not imply that a system is compliant with The approach in Figure 4.4-1 is recommended. The key point is to run one system with two front ends (one for meeting an ETSI Technical Specification, and one for a portal). The goal is to make the front end systems as thin as possible i.e. to put most of the functionality in the main Request Processing System. -![A picture showing the reference design](fig441.png) +![Figure 4.4-1: Approach to portal design](./fig441.png) -**Figure 4.4-1: Approach to portal design** The design in Figure 4.4-1 is not a strict architecture or design and is not intended to constrain data flows or security boundaries. @@ -251,7 +253,7 @@ No additional comments on this topic are made in the present document. # Annex A : Change history | Date | Version | Information about changes | -|------------|---------|---------------------------| +|-|-|-| |December 2025 | 0.6.0 | Version uploaded for discussion on 2025-12-16 | |December 2025 | 0.6.1 | Version at end of discussion on 2025-12-16 | | | | | @@ -259,3 +261,15 @@ No additional comments on this topic are made in the present document. + + + + + + + + + + + + diff --git a/104196/publish.sh b/104196/publish.sh index 16e92e7f..7bf580fb 100755 --- a/104196/publish.sh +++ b/104196/publish.sh @@ -17,14 +17,14 @@ MARKDOWN_TOOLS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/markdownt FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.28.0 echo "\n------ Checking for docker image --------" -docker logout $(echo "$PANDOC_DOCKER_IMAGE" | cut -d "/" -f 1) -docker pull "$PANDOC_DOCKER_IMAGE" -docker logout $(echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1) -docker pull "$GENERATE_BASELINE_DOCKER_IMAGE" -docker logout $(echo "$MARKDOWN_TOOLS_DOCKER_IMAGE" | cut -d "/" -f 1) -docker pull "$MARKDOWN_TOOLS_DOCKER_IMAGE" -docker logout $(echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1) -docker pull "$FORGELIB_DOCKER_IMAGE" +#docker logout $(echo "$PANDOC_DOCKER_IMAGE" | cut -d "/" -f 1) +#docker pull "$PANDOC_DOCKER_IMAGE" +#docker logout $(echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1) +#docker pull "$GENERATE_BASELINE_DOCKER_IMAGE" +#docker logout $(echo "$MARKDOWN_TOOLS_DOCKER_IMAGE" | cut -d "/" -f 1) +#docker pull "$MARKDOWN_TOOLS_DOCKER_IMAGE" +#docker logout $(echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1) +#docker pull "$FORGELIB_DOCKER_IMAGE" echo "------ Removing previous outputs --------" rm -f baseline/*.docx 2>/dev/null || true @@ -63,7 +63,7 @@ done for i in *.md ; do if [ $i != 'README.md' ]; then if [[ $i =~ (GS|GR|TS|TR|EN|EG).*\.md ]] ; then - echo "\n------ Processing MD file to combine all clauses (::include) -------" + echo "\n------ Processing $i to combine all clauses (::include) -------" docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec -fmo "$i" -fmf frontmatter.md docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec "$i" > combined.md cat combined.md > $i @@ -72,7 +72,7 @@ for i in *.md ; do echo "\n------ Preparing spec --------" docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_BASELINE_DOCKER_IMAGE" pandocFilter -ts -fp -o "/tmp/" "/tmp/$i" echo "\n------ Publishing spec --------" - mkdir baseline + [ -d baseline ] || mkdir baseline # Word output docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) -w "/data" "$PANDOC_DOCKER_IMAGE" "/data/$i" --toc --metadata toc-title="Contents" -F mermaid-filter -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${SPEC_TEMPLATE}" -o "baseline/${SPEC_NAME}_${TAG_NAME}.docx" #echo 'docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t pdf -o "${4}_${2}.pdf"' -- GitLab From efe0002f927960a16eab78ca12295aeab240142c Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 11:34:15 +0000 Subject: [PATCH 6/9] Artefacts --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cedeae6..09cd7dad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,12 @@ markdown: script: - cd 104196 - ./publish.sh 001 ts_spec_template.docx 104196 ts_cover_skeleton.docx TS - + artifacts: + untracked: true + paths: + - "104196/baseline/*.docx" + name: $CI_MERGE_REQUEST_TITLE + expire_in: 30 days # ----------------------------------------------------------- # Preflight -- GitLab From c903ee5ac8eab419ef04aed635e093739c5657c8 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 11:40:00 +0000 Subject: [PATCH 7/9] Remove untracked --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09cd7dad..0b87157d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,6 @@ markdown: - cd 104196 - ./publish.sh 001 ts_spec_template.docx 104196 ts_cover_skeleton.docx TS artifacts: - untracked: true paths: - "104196/baseline/*.docx" name: $CI_MERGE_REQUEST_TITLE -- GitLab From cf8e39d7a5d88984e84ba1eda2af6ee6e2d6788f Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 11:45:00 +0000 Subject: [PATCH 8/9] Restoring header --- 104196/TS_104196.md | 46 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/104196/TS_104196.md b/104196/TS_104196.md index cc7e261f..331f0d8f 100644 --- a/104196/TS_104196.md +++ b/104196/TS_104196.md @@ -1,25 +1,22 @@ +--- +Title: Considerations for using portals to support requests from
Authorized Organisations +Spec Number: TR 104 196 +Version: v0.6.0 +Date: 2025-11 +keywords: Markdown, Gitlab +Copyright Year: 2025 +Long ISG Name: Technical Committee Lawful Interception +Short ISG Name: TC LI +--- - - - - - - - - - - - - # Intellectual Property Rights Essential patents @@ -111,8 +108,9 @@ Adoption of the present document does not imply that a system is compliant with The approach in Figure 4.4-1 is recommended. The key point is to run one system with two front ends (one for meeting an ETSI Technical Specification, and one for a portal). The goal is to make the front end systems as thin as possible i.e. to put most of the functionality in the main Request Processing System. -![Figure 4.4-1: Approach to portal design](./fig441.png) +![A picture showing the reference design](fig441.png) +**Figure 4.4-1: Approach to portal design** The design in Figure 4.4-1 is not a strict architecture or design and is not intended to constrain data flows or security boundaries. @@ -253,23 +251,7 @@ No additional comments on this topic are made in the present document. # Annex A : Change history | Date | Version | Information about changes | -|-|-|-| +|------------|---------|---------------------------| |December 2025 | 0.6.0 | Version uploaded for discussion on 2025-12-16 | |December 2025 | 0.6.1 | Version at end of discussion on 2025-12-16 | | | | | - - - - - - - - - - - - - - - - -- GitLab From d3d3aaa6c963b074da762283fcc5a14d8f5ede79 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 16 Dec 2025 11:59:26 +0000 Subject: [PATCH 9/9] Restoring docker pull --- 104196/publish.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/104196/publish.sh b/104196/publish.sh index 7bf580fb..5344b40d 100755 --- a/104196/publish.sh +++ b/104196/publish.sh @@ -17,14 +17,14 @@ MARKDOWN_TOOLS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/markdownt FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.28.0 echo "\n------ Checking for docker image --------" -#docker logout $(echo "$PANDOC_DOCKER_IMAGE" | cut -d "/" -f 1) -#docker pull "$PANDOC_DOCKER_IMAGE" -#docker logout $(echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1) -#docker pull "$GENERATE_BASELINE_DOCKER_IMAGE" -#docker logout $(echo "$MARKDOWN_TOOLS_DOCKER_IMAGE" | cut -d "/" -f 1) -#docker pull "$MARKDOWN_TOOLS_DOCKER_IMAGE" -#docker logout $(echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1) -#docker pull "$FORGELIB_DOCKER_IMAGE" +docker logout $(echo "$PANDOC_DOCKER_IMAGE" | cut -d "/" -f 1) +docker pull "$PANDOC_DOCKER_IMAGE" +docker logout $(echo "$GENERATE_BASELINE_DOCKER_IMAGE" | cut -d "/" -f 1) +docker pull "$GENERATE_BASELINE_DOCKER_IMAGE" +docker logout $(echo "$MARKDOWN_TOOLS_DOCKER_IMAGE" | cut -d "/" -f 1) +docker pull "$MARKDOWN_TOOLS_DOCKER_IMAGE" +docker logout $(echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1) +docker pull "$FORGELIB_DOCKER_IMAGE" echo "------ Removing previous outputs --------" rm -f baseline/*.docx 2>/dev/null || true -- GitLab