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

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email ) Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... Patch Set 1: (1 comment) File _testenv/testenv/podman_install.py: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934/comment/ba0046d0_7e99… : PS1, Line 141: configure_cmd = ["./configure", "--enable-static", "--disable-shared"] Without this I had: > /home/user/.cache/osmo-ttcn3-testenv/git/build_against_osmocom:latest/libosmo-sigtran/examples/.libs/sccp_demo_user: error while loading shared libraries: libosmo-sigtran.so.11: cannot open shared object file: No such file or directory I investigated, and it was caused by the libtool script not setting LD_LIBRARY_PATH correctly when there is a : in the directory (as in osmocom:latest). I've replaced the : instead and added a comment about it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?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: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 07:05:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... sccp: testenv: fix run with asan + latest binaries When running against osmocom:nightly:asan, build sccp_demo_user with --enable-sanitize. Otherwise this code is not running with asan and doesn't even start (as the libraries we link against are built with --enable-sanitize). When running against osmocom:latest, check out the latest tag instead of current master. Fixes: OS#5899 Change-Id: I5307125560694feae9f0978ebd27607a77ed8675 --- M _testenv/testenv/podman_install.py 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/39934/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix hardcoded sccp_demo_user path

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?usp=email ) Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ...................................................................... sccp: testenv: fix hardcoded sccp_demo_user path The current path only worked for with podman and with osmo-dev. Make it work for the following use cases too: * without podman, with osmo-dev * with podman, with binary packages (instead of osmo-dev) Removing package=no is required, so testenv builds sccp_demo_user from source when running with --binary-packages. This is needed as sccp_demo_user is not packaged (OS#5899). Change-Id: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 --- A sccp/run_sccp_demo_user.sh M sccp/testenv.cfg 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sccp/run_sccp_demo_user.sh b/sccp/run_sccp_demo_user.sh new file mode 100755 index 0000000..88cd507 --- /dev/null +++ b/sccp/run_sccp_demo_user.sh @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +if [ -n "$OSMO_DEV_MAKE_DIR" ]; then + # Using osmo-dev: either with or without --podman + exec "$OSMO_DEV_MAKE_DIR"/libosmo-sigtran/examples/sccp_demo_user "$@" +fi + +# Using binary packages: as sccp_demo_user is not packaged it gets +# built by testenv/podman_install.py:from_source_sccp_demo_user() +# and symlinked to /usr/local/bin. +exec sccp_demo_user "$@" diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index 44ba8ce..de7b630 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -3,7 +3,6 @@ config=SCCP_Tests.cfg [sccp_demo_user] -program=~/.cache/osmo-ttcn3-testenv/podman/make/libosmo-sigtran/examples/.libs/sccp_demo_user -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg +program=run_sccp_demo_user.sh -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg make=libosmo-sigtran -package=no copy=sccp_demo_user.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?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: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 Gerrit-Change-Number: 39923 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>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: fix OSMO_DEV_MAKE_DIR env var

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?usp=email ) Change subject: testenv: fix OSMO_DEV_MAKE_DIR env var ...................................................................... testenv: fix OSMO_DEV_MAKE_DIR env var When --autoreconf-in-src-copy was made the default, the make dir name has been changed to make2 but this variable was not adjusted. Fix it. Fixes: dacbca96 ("testenv: use --autoreconf-in-src-copy by default") Change-Id: Ia46ebe1240806995960545afbb34e6533580f209 --- M _testenv/testenv/cmd.py 1 file changed, 2 insertions(+), 2 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/cmd.py b/_testenv/testenv/cmd.py index 5e651bd..864b8b9 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -45,9 +45,9 @@ env_extra["TESTENV_GIT_DIR"] = testenv.podman_install.git_dir else: if testenv.args.podman: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make") + env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") else: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make") + env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make2") if testenv.args.kernel == "debian": env_extra["TESTENV_QEMU_KERNEL"] = "debian" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?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: Ia46ebe1240806995960545afbb34e6533580f209 Gerrit-Change-Number: 39922 Gerrit-PatchSet: 3 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>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?usp=email ) Change subject: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset' ...................................................................... stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset' Reset the eSLS binding table state before starting the test, to run it with a clean state. This test also fixes TC_unknown_client_dynamic_tmt_loadshare since it now resets the table after connecting the 2nd dynamic ASP, which allows re-distributing all seeds in the table into the new available set of ASPs. Depends: libosmo-sigtran.git Change-Id I56c34072a9ded42c13dbfc105a0ab3353ca353ec Change-Id: I40b7724edcc06a3df641e316be4770d0e56bb72d --- M stp/STP_Tests_IPA.ttcn M stp/STP_Tests_M3UA.ttcn 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 88c9312..66e7262 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -269,7 +269,8 @@ f_init_ipa(); - f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "traffic-mode loadshare"); + f_vty_config3(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, + { "traffic-mode loadshare", "binding-table reset" }); /* bring up the 'sender' side (single ASP in AS) */ f_connect_ipa(0, unknwon_dynamic_asp); @@ -284,6 +285,10 @@ /* activate the second 'receiver' side ASP */ f_connect_ipa(3, unknwon_dynamic_asp); + /* Since we are using dynamic ASPs, they were unknown by STP until they got connected. + * Hence, reset the binding-table so that load is now properly spread among them: */ + f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "binding-table reset" ); + /* verify traffic is routed from sender to new receiver */ const integer iter_per_asp := 20; const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index ba44b3f..89be9e0 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -663,7 +663,8 @@ f_init_m3ua(); - f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "traffic-mode loadshare"); + f_vty_config3(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, + { "traffic-mode loadshare", "binding-table reset" }); var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?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: I40b7724edcc06a3df641e316be4770d0e56bb72d Gerrit-Change-Number: 39918 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset'

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?usp=email ) Change subject: stp: TC_tmt_loadshare*: Use new vty command 'binding-table reset' ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Merging now to get test fixed over weekend. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39918?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: I40b7724edcc06a3df641e316be4770d0e56bb72d Gerrit-Change-Number: 39918 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 21:45:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix hardcoded sccp_demo_user path

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/+/39923?usp=email ) Change subject: sccp: testenv: fix hardcoded sccp_demo_user path ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39923?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: Id6e0b669dcb71cab9e789fe011e60827a8e07f77 Gerrit-Change-Number: 39923 Gerrit-PatchSet: 3 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: Fri, 04 Apr 2025 18:25:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: fix OSMO_DEV_MAKE_DIR env var

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/+/39922?usp=email ) Change subject: testenv: fix OSMO_DEV_MAKE_DIR env var ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39922?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: Ia46ebe1240806995960545afbb34e6533580f209 Gerrit-Change-Number: 39922 Gerrit-PatchSet: 2 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: Fri, 04 Apr 2025 18:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email ) Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... Patch Set 1: (1 comment) File _testenv/testenv/podman_install.py: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934/comment/02ad9fe3_9461… : PS1, Line 141: configure_cmd = ["./configure", "--enable-static", "--disable-shared"] why is this needed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?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: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Apr 2025 16:51:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email ) Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... sccp: testenv: fix run with asan + latest binaries When running against osmocom:nightly:asan, build sccp_demo_user with --enable-sanitize. Otherwise this code is not running with asan and doesn't even start (as the libraries we link against are built with --enable-sanitize). When running against osmocom:latest, check out the latest tag instead of current master. Fixes: OS#5899 Change-Id: I5307125560694feae9f0978ebd27607a77ed8675 --- M _testenv/testenv/podman_install.py 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/39934/1 diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 2c5ae5a..dd7d74d 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -20,7 +20,8 @@ global sccp_dir global jobs - git_dir = os.path.join(testenv.args.cache, "git") + git_dir = os.path.join(testenv.args.cache, "git", f"build_against_{testenv.args.binary_repo}") + sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 @@ -97,6 +98,14 @@ logging.debug("libosmo-sigtran: already cloned") return + branch = "master" + if testenv.args.binary_repo.endswith(":latest"): + ls_remote = testenv.cmd.run( + ["git", "ls-remote", "--tags", "https://gerrit.osmocom.org/libosmo-sigtran"], capture_output=True, text=True + ) + branch = ls_remote.stdout.split("\n")[-2].split("refs/tags/")[1].split("^")[0] + + logging.info(f"libosmo-sigtran: cloning {branch}") testenv.cmd.run( [ "git", @@ -105,6 +114,8 @@ "clone", "--depth", "1", + "--branch", + branch, "https://gerrit.osmocom.org/libosmo-sigtran", ] ) @@ -126,7 +137,12 @@ clone_libosmo_sigtran() logging.info("Building sccp_demo_user") testenv.cmd.run(["autoreconf", "-fi"], cwd=sccp_dir) - testenv.cmd.run(["./configure"], cwd=sccp_dir) + + configure_cmd = ["./configure", "--enable-static", "--disable-shared"] + if testenv.args.binary_repo.endswith(":asan"): + configure_cmd += ["--enable-sanitize"] + testenv.cmd.run(configure_cmd, cwd=sccp_dir) + testenv.cmd.run( ["make", "-j", f"{jobs}", "libosmo-sigtran.la"], cwd=os.path.join(sccp_dir, "src"), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025