May 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: remove pdf draft watermark for latest pkgs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40344?usp=email ) Change subject: OBS: remove pdf draft watermark for latest pkgs ...................................................................... OBS: remove pdf draft watermark for latest pkgs Add the line ASCIIDOCSTYLE = $(BUILDDIR)\/custom-dblatex.sty before the line include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc when building source packages for the latest feed, so there is no "DRAFT" watermark. Closes: OS#6188 Change-Id: Ie2e49ba89913321edaa90660a5348209355e61ce --- M scripts/obs/lib/srcpkg.py 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/40344/1 diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index fc39563..6f4e613 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -167,6 +167,18 @@ pathlib.Path(f"{output_path}/commit_{commit}.txt").touch() +def set_asciidoc_style_without_draft_watermark(project): + repo_path = lib.git.get_repo_path(project) + doc_makefiles = lib.run_cmd(["grep", "-r", "-l", "include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc"], cwd=repo_path) + doc_makefiles = doc_makefiles.output.rstrip().split("\n") + + for doc_makefile in doc_makefiles: + print(f"{project}: setting asciidoc style to remove draft watermark in {doc_makefile}") + lib.run_cmd(["sed", "-i", + '/\\/build\\/Makefile\\.asciidoc\\.inc/s/^/ ASCIIDOCSTYLE = $(BUILDDIR)\\/custom-dblatex.sty\\n/', + doc_makefile], cwd=repo_path) + + def build(project, gerrit_id=0): conflict_version = lib.args.conflict_version feed = lib.args.feed @@ -214,6 +226,8 @@ if lib.args.disable_manuals: lib.debian.disable_manuals(project) + elif feed == "latest": + set_asciidoc_style_without_draft_watermark(project) lib.debian.build_source_package(project) lib.debian.move_files_to_output(project) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie2e49ba89913321edaa90660a5348209355e61ce Gerrit-Change-Number: 40344 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-ci[master]: scripts/manuals: use new method for removing DRAFT

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40343?usp=email ) Change subject: scripts/manuals: use new method for removing DRAFT ...................................................................... scripts/manuals: use new method for removing DRAFT osmo-gsm-manuals now has two "ASCIIDOCSTYLE" files: * custom-dblatex.sty (without draft) * custom-dblatex-draft.sty (new default) This change was necessary to make it feasible to build the manuals inside the debian binary packages without the watermark for the osmocom:latest feed (see next patch). Adjust the method for removing the "DRAFT" watermark: instead of patching custom-dblatex.sty, switch from custom-dblatex-draft.sty to custom-dblatex.sty. Depends: osmo-gsm-manuals I33d67748b1e97578f4726009ac73fd0c4e7305db Change-Id: I25060baa41c08fd3e25d5ff0b460d171ee2979ad --- D scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch A scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch M scripts/manuals/publish-manuals-for-tags.sh 3 files changed, 31 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/40343/1 diff --git a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch deleted file mode 100644 index 2addeb4..0000000 --- a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 92a645d74fde8b86ab0a8f6e3d089a0f1edc34d0 Mon Sep 17 00:00:00 2001 -From: Oliver Smith <osmith(a)sysmocom.de> -Date: Wed, 8 Mar 2023 17:48:17 +0100 -Subject: [PATCH] build/custom-dblatex.sty: remove DRAFT - -This patch will be used when generating manuals for the tagged -releases, so they don't have the draft watermark. - -Related: OS#5902 -Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 ---- - build/custom-dblatex.sty | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty -index 16931ad..0d53bb1 100644 ---- a/build/custom-dblatex.sty -+++ b/build/custom-dblatex.sty -@@ -20,10 +20,6 @@ - \usepackage{alltt} - \usepackage{upquote} - --% "DRAFT" on first page --\definecolor{LtGrey}{rgb}{0.875,0.875,0.875} --\AddToShipoutPicture*{ \AtTextCenter{ \makebox(0,0)[c]{\resizebox{\textwidth}{!}{ \rotatebox{45}{\textsf{\textbf{\color{LtGrey}DRAFT}}}}} } } -- - \def\Company{sysmocom - s.f.m.c. GmbH} - - \def\DBKcover{ --- -2.34.1 - diff --git a/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch b/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch new file mode 100644 index 0000000..d4ce792 --- /dev/null +++ b/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch @@ -0,0 +1,30 @@ +From 3c3eb37a11e1cfae9a41d702d3ad0ee8c6517f01 Mon Sep 17 00:00:00 2001 +From: Oliver Smith <osmith(a)sysmocom.de> +Date: Wed, 21 May 2025 12:59:01 +0200 +Subject: [PATCH] build: set ASCIIDOCSTYLE to remove DRAFT + +This patch will be used when generating manuals for the tagged +releases, so they don't have the draft watermark. + +Related: OS#5902 +Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 +--- + build/Makefile.asciidoc.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc +index eb6df99..e2e8ad2 100644 +--- a/build/Makefile.asciidoc.inc ++++ b/build/Makefile.asciidoc.inc +@@ -27,7 +27,7 @@ ASCIIDOC_NAME = $(patsubst %.adoc,%,$(ASCIIDOC)) + ASCIIDOC_PDF = $(ASCIIDOC_NAME:%=%.pdf) + ASCIIDOC_CHECKS = $(ASCIIDOC_NAME:%=%.check) + +-ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex-draft.sty ++ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty + + CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDOC_CHECKS) + CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) +-- +2.43.0 + diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 902019b..f543ab6 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -406,7 +406,7 @@ # Remove DRAFT in osmo-gsm-manuals cd /opt/osmo-gsm-manuals/ - patch -p1 < /manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch + patch -p1 < /manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch # Build manuals cd /build -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40343?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I25060baa41c08fd3e25d5ff0b460d171ee2979ad Gerrit-Change-Number: 40343 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: Add separate asciidoc style file without draft

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/40342?usp=email ) Change subject: Add separate asciidoc style file without draft ...................................................................... Add separate asciidoc style file without draft * Copy custom-dblatex.sty to custom-dblatex-draft.sty * Remove "DRAFT" from custom-dblatex.sty * Set custom-dblatex-draft.sty as default ASCIIDOCSTYLE This allows setting ASCIIDOCSTYLE=custom-dblatex.sty when building the stable packages to not have the "DRAFT" watermark in the generated document. Doing this is backwards compatible with older osmo-gsm-manuals versions (where it won't remove the watermark, but the build won't fail as the file name is the same). Change-Id: I33d67748b1e97578f4726009ac73fd0c4e7305db --- M build/Makefile.asciidoc.inc A build/custom-dblatex-draft.sty M build/custom-dblatex.sty 3 files changed, 92 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/42/40342/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index e2e8ad2..eb6df99 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -27,7 +27,7 @@ ASCIIDOC_PDF = $(ASCIIDOC_NAME:%=%.pdf) ASCIIDOC_CHECKS = $(ASCIIDOC_NAME:%=%.check) -ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty +ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex-draft.sty CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDOC_CHECKS) CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) diff --git a/build/custom-dblatex-draft.sty b/build/custom-dblatex-draft.sty new file mode 100644 index 0000000..16931ad --- /dev/null +++ b/build/custom-dblatex-draft.sty @@ -0,0 +1,91 @@ +%% +%% This style is derived from the docbook one. +%% "${OSMO_GSM_MANUALS_DIR}/common" is symlinked to ./common when building. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{asciidoc}[2008/06/05 AsciiDoc DocBook Style] +%% Just use the original package and pass the options. +\RequirePackageWithOptions{docbook} + +% Sidebar is a boxed minipage that can contain verbatim. +% Changed shadow box to double box. +\renewenvironment{sidebar}[1][0.95\textwidth]{ + \hspace{0mm}\newline% + \noindent\begin{Sbox}\begin{minipage}{#1}% + \setlength\parskip{\medskipamount}% +}{ + \end{minipage}\end{Sbox}\doublebox{\TheSbox}% +} + +\usepackage{alltt} +\usepackage{upquote} + +% "DRAFT" on first page +\definecolor{LtGrey}{rgb}{0.875,0.875,0.875} +\AddToShipoutPicture*{ \AtTextCenter{ \makebox(0,0)[c]{\resizebox{\textwidth}{!}{ \rotatebox{45}{\textsf{\textbf{\color{LtGrey}DRAFT}}}}} } } + +\def\Company{sysmocom - s.f.m.c. GmbH} + +\def\DBKcover{ +\ifthenelse{\equal{\DBKedition}{}}{\def\edhead{}}{\def\edhead{Ed. \DBKedition}} + +% ensure the section is called just HISTORY as required by GFDL +\def\DBKrevtitle{HISTORY} + +% put numbers in section headers up to depth 5 (instead of just 3 by default) +\setcounter{secnumdepth}{5} + +% interligne double +\setlength{\oldbaselineskip}{\baselineskip} +\setlength{\baselineskip}{2\oldbaselineskip} +\textsf{ +\vfill +\begin{center} + \includegraphics{./common/images/sysmocom.pdf} + \ \\ % + \huge{\Company} +\end{center} +\vspace{2.5cm} +\begin{center} + \includegraphics{./common/images/osmocom.pdf} + \ \\ % + \vspace{0.5cm} + \huge{\textbf{\DBKtitle}}\\ % + \ifx\DBKsubtitle\relax\else% + \underline{\ \ \ \ \ \ \ \ \ \ \ }\\ % + \ \\ % + \huge{\textbf{\DBKsubtitle}}\\ % + \fi + \vspace*{2.5cm} + \large{by \DBKauthor} +\end{center} +\vfill +\setlength{\baselineskip}{\oldbaselineskip} +\hspace{1cm} +\vspace{1cm} +\begin{center} +\begin{tabular}{p{7cm} p{7cm}} +\Large{\DBKreference{} \edhead} & \\ +\end{tabular} +\end{center} +} + +% Format for the other pages +%\newpage +\setlength{\baselineskip}{\oldbaselineskip} +} + +% left footer +\def\DBKpublisher{} + +\def\releasebox{} +\rfoot[]{\DBKreleaseinfo, \DBKdate} + +\def\maketitle{ + \DBKcover + \DBKcopyright + \DBKlegalblock + \newpage + \lfoot[]{\DBKcopyright} + \DBKdomitete +} diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty index 16931ad..0d53bb1 100644 --- a/build/custom-dblatex.sty +++ b/build/custom-dblatex.sty @@ -20,10 +20,6 @@ \usepackage{alltt} \usepackage{upquote} -% "DRAFT" on first page -\definecolor{LtGrey}{rgb}{0.875,0.875,0.875} -\AddToShipoutPicture*{ \AtTextCenter{ \makebox(0,0)[c]{\resizebox{\textwidth}{!}{ \rotatebox{45}{\textsf{\textbf{\color{LtGrey}DRAFT}}}}} } } - \def\Company{sysmocom - s.f.m.c. GmbH} \def\DBKcover{ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/40342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I33d67748b1e97578f4726009ac73fd0c4e7305db Gerrit-Change-Number: 40342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: move epdg to testenv

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40332?usp=email ) Change subject: jobs/ttcn3: move epdg to testenv ...................................................................... jobs/ttcn3: move epdg to testenv Change-Id: I14a0ec774448782eb31e79e2a19b3631c3041735 --- M jobs/ttcn3-testsuites-testenv.yml M jobs/ttcn3-testsuites.yml 2 files changed, 24 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 545900e..0596321 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -201,6 +201,18 @@ args: -b osmocom:nightly timer: H 10 * * * + - ttcn3-epdg-test: # ~4 min + testsuite: epdg + args: -b osmocom:nightly --custom-kernel + timer: H 10 * * * + kernel: torvalds + + - ttcn3-epdg-test-net-next: # ~4 min + testsuite: epdg + args: -b osmocom:nightly --custom-kernel + timer: H 10 * * * + kernel: net-next + # --------------------------------------------- # Debian latest # --------------------------------------------- @@ -357,6 +369,18 @@ args: -b osmocom:latest timer: H 13 * * * + - ttcn3-epdg-test-latest: # ~4 min + testsuite: epdg + args: -b osmocom:latest --custom-kernel + timer: H 13 * * * + kernel: torvalds + + - ttcn3-epdg-test-latest-net-next: # ~4 min + testsuite: epdg + args: -b osmocom:latest --custom-kernel + timer: H 13 * * * + kernel: net-next + # --------------------------------------------- # Debian nightly + io_uring (OS#6357) # --------------------------------------------- diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 27b6b10..0ea8a96 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -38,10 +38,6 @@ description: | Test open5gs-smfd + open5gs-upfd PGW main. email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - - ttcn3-epdg-test: # ~4 min - timer: H 06 * * * - # osmo-epdg requires OTP and kernel >= debian12: - node: build4-deb12build-ansible - ttcn3-asterisk-ims-ue-test: # ~19 min timer: H 06 * * * @@ -53,10 +49,6 @@ - ttcn3-gbproxy-test-fr-latest: # ~23 min timer: H 07 * * * node: hdlc - - ttcn3-epdg-test-latest: # ~5 min - timer: H 07 * * * - # osmo-epdg requires OTP and kernel >= debian12: - node: build4-deb12build-ansible # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian) jobs -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40332?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14a0ec774448782eb31e79e2a19b3631c3041735 Gerrit-Change-Number: 40332 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: check eclipse-titan version

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40335?usp=email ) Change subject: testenv: check eclipse-titan version ...................................................................... testenv: check eclipse-titan version The osmocom:latest repository currently has eclipse-titan 9.0.0 and we assume that the user has at least this version installed. Add a check to avoid subtle unexpected errors caused by using older versions. Related: I57eecd6e0ea9e488a2110b029ddc313bd05cd1fa Change-Id: Icace325f492ce803d6f25a30b128ee0676e16727 --- M _testenv/testenv/requirements.py 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index cd320d5..5ab61ad 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -1,8 +1,10 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later +from packaging.version import Version import logging import os.path import shutil +import subprocess import sys import testenv import testenv.cmd @@ -69,6 +71,30 @@ sys.exit(1) +def check_ttcn3_compiler_version(): + if testenv.args.podman: + return + + ttcn3_min_version = "9.0.0" + + v = subprocess.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) + current = None + for line in v.stderr.split("\n"): + if not line.startswith("Version: "): + continue + + current = line.split(":", 1)[1].strip() + if Version(current) >= Version(ttcn3_min_version): + return + + logging.error(f"Found ttcn3_compiler version {current}, but {ttcn3_min_version} or higher is required.") + + if not current: + logging.error("Could not parse ttcn3_compiler version.") + logging.error(f"Please install at least version {ttcn3_min_version} and try again.") + sys.exit(1) + + def check_fftranscode(): cmd = [ "grep", @@ -98,6 +124,7 @@ def check(): check_programs() + check_ttcn3_compiler_version() if not testenv.args.podman: check_fftranscode() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icace325f492ce803d6f25a30b128ee0676e16727 Gerrit-Change-Number: 40335 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: epdg: initial testenv.cfg

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40321?usp=email ) Change subject: epdg: initial testenv.cfg ...................................................................... epdg: initial testenv.cfg With this config, all tests are passing. Depends: osmo-ci Ia60d5c1f5ade31e37293b40340e789f04ea86287 Change-Id: Ide2873be7830cc43e7fa09f26b2d504d0563a3c2 --- M epdg/EPDG_Tests.cfg A epdg/osmo-epdg.config A epdg/testenv.cfg A epdg/testenv/run_osmo_epdg_with_dummy_ue.sh A epdg/testenv/run_qemu.sh A epdg/testenv/wait_until_osmo_epdg_is_ready.sh 6 files changed, 253 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.cfg b/epdg/EPDG_Tests.cfg index c164293..00be40f 100644 --- a/epdg/EPDG_Tests.cfg +++ b/epdg/EPDG_Tests.cfg @@ -12,6 +12,18 @@ [MODULE_PARAMETERS] +EPDG_Tests.mp_gsup_local_ip := "172.18.3.103" +EPDG_Tests.mp_swx_local_ip := "172.18.3.103" +EPDG_Tests.mp_s6b_local_ip := "172.18.3.103" +EPDG_Tests.mp_s2b_local_ip := "172.18.3.103" +EPDG_Tests.mp_upf_gtpu_local_ip := "172.18.3.103" + +EPDG_Tests.mp_gsup_remote_ip := "172.18.3.20" +EPDG_Tests.mp_s6b_remote_ip := "172.18.3.20" +EPDG_Tests.mp_s2b_remote_ip := "172.18.3.20" + +# Match (diameter_watchdog_timer/1000)*diameter_watchdog_config["okay"] in osmo-epdg.config: +EPDG_Tests.mp_diam_watchdog_initial_wait_sec := 6; [MAIN_CONTROLLER] diff --git a/epdg/osmo-epdg.config b/epdg/osmo-epdg.config new file mode 100644 index 0000000..d8919eb --- /dev/null +++ b/epdg/osmo-epdg.config @@ -0,0 +1,87 @@ +[ + %% =========================================== + %% Application config + %% =========================================== + {osmo_epdg, + [% GSUP Server connection parameters + {gsup_local_ip, "172.18.3.20"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters + {dia_swx_remote_ip, "172.18.3.103"}, + {dia_swx_remote_port, 3868}, + {dia_swx_proto, sctp}, + {dia_swx_connect_timer, 200}, + {dia_swx_watchdog_timer, 6000}, + {dia_swx_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_swx_vendor_id, 0}, + {dia_swx_origin_host, "epdg.localdomain"}, + {dia_swx_origin_realm, "localdomain"}, + {dia_swx_context_id, "epdg@localdomain"}, + % Diameter s6b Connection parameters + {dia_s6b_local_ip, "172.18.3.20"}, + {dia_s6b_local_port, 3869}, + {dia_s6b_proto, sctp}, + {dia_s6b_connect_timer, 200}, + {dia_s6b_watchdog_timer, 6000}, + {dia_s6b_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_s6b_vendor_id, 0}, + {dia_s6b_origin_host, "aaa.localdomain"}, + {dia_s6b_origin_realm, "localdomain"}, + {dia_s6b_context_id, "aaa@localdomain"}, + % GTPv2C Connection parameters + {gtpc_local_ip, "172.18.3.20"}, + {gtpc_local_port, 2123}, + {gtpc_remote_ip, "172.18.3.103"}, + {gtpc_remote_port, 2123} + ] + }, + %% =========================================== + %% gtp_u_kmod config + %% =========================================== + {gtp_u_kmod, [ + {sockets, [{gtp0, [%% ip: IP Address assigned at the tunnel: + {ip, {172,18,3,20}}, + %% Allow binding to an IP address that is nonlocal or does not (yet) exist (IP_FREEBIND): + freebind, + % Create gtp tundev with role SGSN: + {role, sgsn} + ] + }] + } + ]}, + %% =========================================== + %% gen_socket config + %% =========================================== + {gen_socket, [ + {libdir, "@GEN_SOCKET_LIBDIR@"} +]}, + %% =========================================== + %% Lager logging config + %% =========================================== + {lager, [ + {log_root, "/data/"}, + {colored, true}, + {handlers, + [{lager_console_backend, [{level, debug}]}, + {lager_file_backend, + [{file, "console.log"}, {level, debug}, {size, 104857600}, {date, "$D0"}, {count, 10}]}, + {lager_file_backend, + [{file, "error.log"}, {level, error}, {size, 104857600}, {date, "$D0"}, {count, 10}]}]}, + {crash_log, "crash.log"}, + {crash_log_msg_size, 65536}, + {crash_log_size, 104857600}, + {crash_log_date, "$D0"}, + {crash_log_count, 10}, + {error_logger_redirect, true} + ]}, + {kernel, [ + {logger, [{handler, debug, logger_std_h, % {handler, HandlerId, Module, + #{config => #{file => "/data/erlang.log"}} + }] + } + ]} +]. diff --git a/epdg/testenv.cfg b/epdg/testenv.cfg new file mode 100644 index 0000000..e8980bd --- /dev/null +++ b/epdg/testenv.cfg @@ -0,0 +1,12 @@ +[testsuite] +program=EPDG_Tests +config=EPDG_Tests.cfg + +[epdg] +qemu=required +program=testenv/run_qemu.sh +setup=testenv/wait_until_osmo_epdg_is_ready.sh +clean=EXTRA_IPS="172.18.3.103" add_remove_testenv0_bridge.sh +make=osmo-epdg +package=osmo-epdg +copy=osmo-epdg.config testenv diff --git a/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh new file mode 100755 index 0000000..93853b8 --- /dev/null +++ b/epdg/testenv/run_osmo_epdg_with_dummy_ue.sh @@ -0,0 +1,39 @@ +#!/bin/sh -ex +EPDG_TUN="gtp0" +UE_IFACE="ue" +UE_SUBNET="192.168.0.0/16" +UE_ADDR="192.168.0.2/16" + +ip link add "$UE_IFACE" type dummy +ip addr add "$UE_ADDR" dev "$UE_IFACE" +ip link set "$UE_IFACE" up +ip rule add from "$UE_SUBNET" table 45 + +ERL_FLAGS='-config osmo-epdg.config' osmo-epdg & + +set +x + +FOUND=0 +for i in $(seq 1 10); do + sleep 1 + if ip link ls dev "$EPDG_TUN" 2>&1 >/dev/null; then + FOUND=1 + break + fi +done + +if [ "$FOUND" = 0 ]; then + echo + echo "ERROR: run_osmo_epdg_with_dummy_ue.sh: osmo-epdg did not create $EPDG_TUN!" + echo + exit 1 +fi + +ip route add default dev $EPDG_TUN table 45 + +echo +# wait_until_osmo_epdg_is_ready.sh checks for this string +echo "run_osmo_epdg_with_dummy_ue.sh: osmo-epdg is ready" +echo + +wait diff --git a/epdg/testenv/run_qemu.sh b/epdg/testenv/run_qemu.sh new file mode 100755 index 0000000..024e423 --- /dev/null +++ b/epdg/testenv/run_qemu.sh @@ -0,0 +1,76 @@ +#!/bin/sh -ex +GEN_SOCKET_LIBDIR="" + +set_gen_socket_libdir() { + if [ -z "$OSMO_DEV_MAKE_DIR" ]; then + # With --binary-repo + GEN_SOCKET_LIBDIR=/usr/lib + else + # Without --binary-repo + GEN_SOCKET_LIBDIR="$OSMO_DEV_MAKE_DIR"/osmo-epdg/default/lib/gen_socket/priv/lib + fi +} + +adjust_osmo_epdg_config() { + sed -i "s~@GEN_SOCKET_LIBDIR@~$GEN_SOCKET_LIBDIR~" osmo-epdg.config +} + +build_initrd() { + qemu_initrd_init + + qemu_initrd_add_mod \ + dummy \ + gtp \ + sctp \ + tun + + qemu_initrd_add_bin \ + "$GEN_SOCKET_LIBDIR"/gen_socket.so \ + "$GEN_SOCKET_LIBDIR"/gen_socket_nif.so \ + /usr/bin/escript \ + /usr/lib/x86_64-linux-gnu/libm.so.6 \ + /usr/lib/x86_64-linux-gnu/libsctp.so.1 \ + /usr/lib/x86_64-linux-gnu/libstdc++.so.6 \ + /usr/lib/x86_64-linux-gnu/libtinfo.so.6 \ + /usr/lib/x86_64-linux-gnu/libz.so.1 + + qemu_initrd_add_file \ + "$(which osmo-epdg)" \ + /usr/bin/erl \ + /usr/lib/erlang \ + osmo-epdg.config \ + testenv/run_osmo_epdg_with_dummy_ue.sh + + # Enable dynamic_debug + qemu_initrd_add_cmd \ + "mount -t debugfs none /sys/kernel/debug || true" \ + "echo -n 'module gtp +p' > /sys/kernel/debug/dynamic_debug/control || true" + + qemu_initrd_add_cmd \ + "ip addr add 172.18.3.20/24 brd 172.18.3.255 dev eth0" \ + "ip route add default via 172.18.3.1 dev eth0" \ + "sysctl net.ipv4.ip_forward=1" \ + "sysctl net.ipv4.conf.all.rp_filter=0" \ + "sysctl net.ipv4.conf.default.rp_filter=0" \ + "testenv/run_osmo_epdg_with_dummy_ue.sh" + + qemu_initrd_finish +} + + +# FIXME: when using the debian kernel, osmo-epdg doesn't create the gtp device +# and then fails with: "terminating ss7_routes with reason shutdownterminating +# ss7_links with reason shutdownip: can't find device 'gtp0'" +if [ "$TESTENV_QEMU_KERNEL" = "debian" ]; then + set +x + echo + echo "ERROR: epdg currently only works with -C, --custom-kernel" + echo + exit 1 +fi + +set_gen_socket_libdir +adjust_osmo_epdg_config +. qemu_functions.sh +qemu_build_initrd_with_log_redirect +qemu_run diff --git a/epdg/testenv/wait_until_osmo_epdg_is_ready.sh b/epdg/testenv/wait_until_osmo_epdg_is_ready.sh new file mode 100755 index 0000000..96f02e3 --- /dev/null +++ b/epdg/testenv/wait_until_osmo_epdg_is_ready.sh @@ -0,0 +1,27 @@ +#!/bin/sh -e +LOGFILE="$(basename "$PWD").log" + +# Wait until osmo-epdg is ready and fail early if errors are logged during +# startup. Otherwise osmo-epdg may keep running and we get less obvious +# failures later. +epdg_wait() { + i=0 + for i in $(seq 1 150); do + sleep 0.1 + + if grep -q "\[error\]" "$LOGFILE"; then + # The log output is visible in stdout + exit 1 + fi + + if grep -q "run_osmo_epdg_with_dummy_ue.sh: osmo-epdg is ready" "$LOGFILE"; then + exit 0 + fi + done + + echo "ERROR: wait_until_osmo_epdg_is_ready.sh: osmo-epdg failed to start" + exit 1 +} + +qemu_wait.sh +epdg_wait -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ide2873be7830cc43e7fa09f26b2d504d0563a3c2 Gerrit-Change-Number: 40321 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg: add sleep to f_TC_hss_initiated_deregister_permanent_termination

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40319?usp=email ) Change subject: epdg: add sleep to f_TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: add sleep to f_TC_hss_initiated_deregister_permanent_termination The test sends PERMANENT_TERMINATION twice to osmo-epdg. If we don't sleep between them, osmo-epdg is not able to terminate related FSMs quickly enough between the first and the second termination request when running in QEMU, which results in osmo-epdg answering with DIAMETER_SUCESS instead of DIAMETER_ERROR_USER_UNKNOWN for the second f_DIA_SWx_RT. Related: OS#6796 Change-Id: I5d7021b6a9800cf1d7588f4a0ef864f5c30cf475 --- M epdg/EPDG_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index b551b67..2fcbcb3 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -1192,6 +1192,7 @@ f_initial_attach(); /* Procedure should be performed properly: */ f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ResultCode(DIAMETER_SUCCESS)); + f_sleep(1.0); /* OS#6796 */ /* Subscriber was already removed, it should fail if requested again: */ var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4)), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40319?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5d7021b6a9800cf1d7588f4a0ef864f5c30cf475 Gerrit-Change-Number: 40319 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: epdg: TC_concurrent_ues_MTC: rx CMD_ATTACHED without from vc_conn_lis...

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40320?usp=email ) Change subject: epdg: TC_concurrent_ues_MTC: rx CMD_ATTACHED without from vc_conn_list[i] ...................................................................... epdg: TC_concurrent_ues_MTC: rx CMD_ATTACHED without from vc_conn_list[i] This is needed to make the test pass in QEMU. I think this makes it accept the COORD_CMD_ATTACHED in any order instead of the order the COORD_CMD_START were sent beforehand. Increasing the sleep between the COORD_CMD_START also makes the test pass in QEMU, but that increases the overall test time significantly in TC_concurrent_ues100. Change-Id: I4c76d12273a14df562ea906e6c8ddb348d1b0eda --- M epdg/EPDG_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 2fcbcb3..61476e2 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -1263,7 +1263,7 @@ } for (var integer i := 0; i < num_ues; i := i + 1) { - COORD.receive(COORD_CMD_READY) from vc_conn_list[i]; + COORD.receive(COORD_CMD_READY); } for (var integer i := 0; i < num_ues; i := i + 1) { @@ -1272,7 +1272,7 @@ } for (var integer i := 0; i < num_ues; i := i + 1) { - COORD.receive(COORD_CMD_ATTACHED) from vc_conn_list[i]; + COORD.receive(COORD_CMD_ATTACHED); } log("All attached!"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4c76d12273a14df562ea906e6c8ddb348d1b0eda Gerrit-Change-Number: 40320 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[XS] Change in osmo-cbc[master]: Fix typo osmo-bsc -> osmo-cbc

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/40336?usp=email ) Change subject: Fix typo osmo-bsc -> osmo-cbc ...................................................................... Fix typo osmo-bsc -> osmo-cbc Change-Id: I3da908d250771ca13e8b3f9069fe4f781defb461 --- M debian/osmo-cbc.install M doc/manuals/chapters/running.adoc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/osmo-cbc.install b/debian/osmo-cbc.install index 76373fd..5ce45f2 100644 --- a/debian/osmo-cbc.install +++ b/debian/osmo-cbc.install @@ -1,4 +1,4 @@ /etc/osmocom/osmo-cbc.cfg lib/systemd/system/osmo-cbc.service usr/bin/osmo-cbc -usr/share/doc/osmo-cbc/examples/osmo-cbc/*.cfg usr/share/doc/osmo-bsc/examples +usr/share/doc/osmo-cbc/examples/osmo-cbc/*.cfg usr/share/doc/osmo-cbc/examples diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5cbe873..b930de1 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -17,5 +17,5 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-bsc.cfg` in the current + used. If none is specified, use `osmo-cbc.cfg` in the current working directory. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/40336?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3da908d250771ca13e8b3f9069fe4f781defb461 Gerrit-Change-Number: 40336 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: check eclipse-titan version

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40335?usp=email ) Change subject: testenv: check eclipse-titan version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icace325f492ce803d6f25a30b128ee0676e16727 Gerrit-Change-Number: 40335 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 May 2025 04:43:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025