- gerrit-log - lists.osmocom.org

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections
by fixeria 28 May '24

28 May '24

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... libmsc: add X5 timer for delaying LU connections The idea is to allow re-using the radio channel that was used for Location Updating to deliver MT SMS over GSUP. This is achieved by delaying release of a BSSAP/RANAP connection and thus delaying the release of the radio channel. The delay can be configured using new timer X5 (default 0 ms), separately for GERAN and UTRAN. Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d Related: SYS#6913 --- M include/osmocom/msc/msc_a.h M src/libmsc/msc_a.c M src/libmsc/ran_infra.c 3 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/36760/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... doc: set state-dir to /var/lib/osmocom/osmo-sgsn Be consistent with osmo-ggsn, and set the state dir to /var/lib/osmocom/osmo-sgsn. Without this patch, it defaults to the current directory, which means in case of running with the systemd service, /var/lib/osmocom. Copy osmo-sgsn.cfg and osmo-sgsn-accept-all.cfg to the tests dir and do not set the state-dir there. Usually the user that runs the VTY and CTRL tests is not allowed to write to /var/lib/osmocom. (I've also tried generating these on the fly, but that breaks in 'make distcheck', as I would need to write to the source dir or would need to change osmo-python-tests etc. to read the config file from another directory.) Related: osmo-ggsn I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a Depends: osmo-python-tests Ic312d546da1c21f68a80b6a188616ef9bc84f4c6 Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 --- M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg M doc/examples/osmo-sgsn/osmo-sgsn.cfg M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg M osmoappdesc.py M tests/Makefile.am M tests/ctrl_test_runner.py A tests/osmo-sgsn-accept-all.cfg A tests/osmo-sgsn.cfg M tests/vty_test_runner.py 9 files changed, 111 insertions(+), 8 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg index 69000b4..9bc1520 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 0b5ef4b..8104725 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg index a7ed9cf..d7fbd75 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -23,6 +23,7 @@ asp asp-clnt-OsmoSGSN-A routing-key 3 0.23.4 sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/osmoappdesc.py b/osmoappdesc.py index c327597..b0a9164 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -16,7 +16,7 @@ app_configs = { - "sgsn": ["doc/examples/osmo-sgsn/osmo-sgsn.cfg"], + "sgsn": ["tests/osmo-sgsn.cfg"], "gtphub": ["doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg"] } @@ -25,7 +25,6 @@ (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") ] -vty_command = ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] +vty_command = ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn.cfg"] vty_app = apps[0] diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c07ac9..fc5af0b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,6 +32,8 @@ $(TESTSUITE) \ vty_test_runner.py \ ctrl_test_runner.py \ + osmo-sgsn-accept-all.cfg \ + osmo-sgsn.cfg \ osmo-sgsn_test-nodes.vty \ $(NULL) @@ -62,7 +64,7 @@ vty-transcript-test: $(top_builddir)/src/sgsn/osmo-sgsn osmo_verify_transcript_vty.py -v \ -n OsmoSGSN -p 4245 \ - -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ + -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/tests/osmo-sgsn.cfg" \ $(U) $${T:-$(srcdir)/osmo-sgsn*.vty} rm -f $(builddir)/gsn_restart diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 69b2478..20c59eb 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -145,8 +145,7 @@ class TestCtrlSGSN(TestCtrlBase): def ctrl_command(self): - return ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] + return ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn.cfg"] def ctrl_app(self): return (4251, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") diff --git a/tests/osmo-sgsn-accept-all.cfg b/tests/osmo-sgsn-accept-all.cfg new file mode 100644 index 0000000..46a5d61 --- /dev/null +++ b/tests/osmo-sgsn-accept-all.cfg @@ -0,0 +1,38 @@ +# Same as doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg, but without 'gtp state-dir' +! +! Osmocom SGSN configuration +! +! +log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + +line vty + no login +! +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication optional + auth-policy accept-all +! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess +! +bssgp +! diff --git a/tests/osmo-sgsn.cfg b/tests/osmo-sgsn.cfg new file mode 100644 index 0000000..cf8509c --- /dev/null +++ b/tests/osmo-sgsn.cfg @@ -0,0 +1,40 @@ +# Same as doc/examples/osmo-sgsn/osmo-sgsn.cfg, but without 'gtp state-dir' +! +! Osmocom SGSN configuration +! +! +log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + +line vty + no login +! +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication required + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port 4222 +! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess +! +bssgp +! diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 0b7df8c..aaa76ed 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -70,8 +70,7 @@ class TestVTYSGSN(TestVTYBase): def vty_command(self): - return ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"] + return ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn-accept-all.cfg"] def vty_app(self): return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 6 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> Gerrit-MessageType: merged

1 0

[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
by osmith 28 May '24

28 May '24

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... Patch Set 6: Code-Review+2 (1 comment) Patchset: PS6: re-apply +2 after commit msg change -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 6 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 07:40:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libsmpp34[master]: Bump version: 1.14.3.3-16b4-dirty → 1.14.4
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/36933?usp=email ) Change subject: Bump version: 1.14.3.3-16b4-dirty → 1.14.4 ...................................................................... Bump version: 1.14.3.3-16b4-dirty → 1.14.4 Change-Id: I3e0c3c2bab1c55ceb828d8066bd49bc8624e21f7 --- M debian/changelog M src/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index c4a3c3e..612e5d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libsmpp34 (1.14.4) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * fix warnings about implicit declaration of strtol() + * build: include git-version-gen into the release tarball + + [ Oliver Smith ] + * contrib: remove rpm spec file + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 27 May 2024 11:16:01 +0200 + libsmpp34 (1.14.3) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/src/Makefile.am b/src/Makefile.am index 0a0fd24..e594dd9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=3:0:2 +LIBVERSION=3:1:2 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36933?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I3e0c3c2bab1c55ceb828d8066bd49bc8624e21f7 Gerrit-Change-Number: 36933 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: OBS: add update_obs_eclipse_titan.sh
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36932?usp=email ) Change subject: OBS: add update_obs_eclipse_titan.sh ...................................................................... OBS: add update_obs_eclipse_titan.sh Add a script to easily update the eclipse-titan package from a git repository. This replaces the previous workflow of downloading the previous source package, modifying it, and re-uploading it. With the git repository, it is easier to see which patches are included, and it is easier to modify the packaging (e.g. add new patches to fix build with latest gcc), and easier to upgrade the eclipse-titan version. I've done this change because it failed to build with the most recent GCC in Debian Unstable. Backporting Vadim's patch from upstream fixes it. Related: https://gitlab.eclipse.org/eclipse/titan/titan.core/-/commit/b5d3d5bf4f0e2c… Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Upgrading_eclipse… Change-Id: Ieb1945d5cf4abf8ae2201f49ea7dce8eb343167e --- A scripts/obs/update_obs_eclipse_titan.sh 1 file changed, 62 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/update_obs_eclipse_titan.sh b/scripts/obs/update_obs_eclipse_titan.sh new file mode 100755 index 0000000..6efb7c6 --- /dev/null +++ b/scripts/obs/update_obs_eclipse_titan.sh @@ -0,0 +1,40 @@ +#!/bin/sh -e +# https://osmocom.org/projects/cellular-infrastructure/wiki/Upgrading_eclipse… +DIR="$(realpath "$(dirname "$0")")" +PROJ="$1" +GIT_URL="https://gitea.osmocom.org/osmith/titan.core" +CHECKOUT="osmocom/9.0.0" + +prepare_git_repo() { + cd "$DIR" + if ! [ -d _cache/eclipse-titan ]; then + mkdir -p _cache + git -C _cache clone "$GIT_URL" eclipse-titan + fi + + cd _cache/eclipse-titan + git fetch + git clean -fdx + git checkout -f -B "$CHECKOUT" + git reset --hard origin/"$CHECKOUT" +} + +update_obs_project() { + cd "$DIR" + ./update_obs_project.py \ + --apiurl https://obs.osmocom.org \ + --docker \ + --allow-unknown-package \ + --git-skip-checkout \ + --git-skip-fetch \ + --version-append "~osmocom" \ + "$PROJ" \ + eclipse-titan +} + +set -x +prepare_git_repo + +if [ -n "$PROJ" ]; then + update_obs_project +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36932?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ieb1945d5cf4abf8ae2201f49ea7dce8eb343167e Gerrit-Change-Number: 36932 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: fail with trace on 1st err
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36935?usp=email ) Change subject: scripts/osmotestconfig: fail with trace on 1st err ...................................................................... scripts/osmotestconfig: fail with trace on 1st err Make it easier to figure out why osmotestconfig failed, by failing on the first error instead of running multiple tests and displaying a failed error count at the end. Raise an error on failure, so we get a python trace. Related: OS#6456 Change-Id: I6a243a2474fbfce63aea8e4418be2f4613808270 --- M scripts/osmotestconfig.py 1 file changed, 25 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index a62edd7..8840741 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -24,25 +24,17 @@ import osmopy.osmoutil as osmoutil -# Return true iff all the tests for the given config pass +# Run all tests for a given config, raise error on failure def test_config(app_desc, config, tmpdir, verbose=True): - try: - err = 0 - if test_config_atest(app_desc, config, verify_doc, verbose)[0] > 0: - err += 1 + if test_config_atest(app_desc, config, verify_doc, verbose)[0] > 0: + raise RuntimeError(f"{config}: verify_doc() failed") - newconfig = copy_config(tmpdir, config) - if test_config_atest(app_desc, newconfig, write_config, verbose) > 0: - err += 1 + newconfig = copy_config(tmpdir, config) + if test_config_atest(app_desc, newconfig, write_config, verbose) > 0: + raise RuntimeError(f"{config}: write_config() failed") - if test_config_atest(app_desc, newconfig, token_vty_command, verbose) > 0: - err += 1 - - return err - - # If there's a socket error, skip the rest of the tests for this config - except IOError: - return 1 + if test_config_atest(app_desc, newconfig, token_vty_command, verbose) > 0: + raise RuntimeError(f"{config}: token_vty_command() failed") def test_config_atest(app_desc, config, run_test, verbose=True): @@ -159,7 +151,6 @@ def test_all_apps(apps, app_configs, tmpdir="writtenconfig", verbose=True, confpath=".", ignore_configs=[]): check_configs_tested("doc/examples/", app_configs, ignore_configs) - errors = 0 for app in apps: if not app_exists(app): print("Skipping app %s (not found)" % app[1], file=sys.stderr) @@ -168,14 +159,9 @@ configs = app_configs[app[3]] for config in configs: config = os.path.join(confpath, config) - errors += test_config(app, config, tmpdir, verbose) + test_config(app, config, tmpdir, verbose) - if not errors: - remove_tmpdir(tmpdir) - - if errors: - print("ERRORS: %d" % errors, file=sys.stderr) - return errors + remove_tmpdir(tmpdir) if __name__ == '__main__': -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36935?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I6a243a2474fbfce63aea8e4418be2f4613808270 Gerrit-Change-Number: 36935 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: remove unused rmtemp arg
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36934?usp=email ) Change subject: scripts/osmotestconfig: remove unused rmtemp arg ...................................................................... scripts/osmotestconfig: remove unused rmtemp arg The rmtmp arg to test_all_apps() is always False, remove it. Change-Id: I469d854cda0a23bbf545953ad2b94666df8e7d04 --- M scripts/osmotestconfig.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 8b3bb84..a62edd7 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -157,7 +157,7 @@ def test_all_apps(apps, app_configs, tmpdir="writtenconfig", verbose=True, - confpath=".", rmtmp=False, ignore_configs=[]): + confpath=".", ignore_configs=[]): check_configs_tested("doc/examples/", app_configs, ignore_configs) errors = 0 for app in apps: @@ -170,7 +170,7 @@ config = os.path.join(confpath, config) errors += test_config(app, config, tmpdir, verbose) - if rmtmp or not errors: + if not errors: remove_tmpdir(tmpdir) if errors: -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36934?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I469d854cda0a23bbf545953ad2b94666df8e7d04 Gerrit-Change-Number: 36934 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: rmtree: no ignore_errors
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36936?usp=email ) Change subject: scripts/osmotestconfig: rmtree: no ignore_errors ...................................................................... scripts/osmotestconfig: rmtree: no ignore_errors Do not ignore errors with shutil.rmtree(). The script expects to be able to delete the directory, otherwise it will fail later on. So this hides the original error and leads to a more confusing error later on. Change-Id: I41616bb27af0d8b7da124ef309cd4a6e53be6597 --- M scripts/osmotestconfig.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 8840741..6580fc7 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -68,7 +68,8 @@ return ret def copy_config(dirname, config): - shutil.rmtree(dirname, True) + if os.path.exists(dirname): + shutil.rmtree(dirname) ign = shutil.ignore_patterns('*.cfg') shutil.copytree(os.path.dirname(config), dirname, ignore=ign) os.chmod(dirname, stat.S_IRWXU) -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36936?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I41616bb27af0d8b7da124ef309cd4a6e53be6597 Gerrit-Change-Number: 36936 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: copy_config: no copytree
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36937?usp=email ) Change subject: scripts/osmotestconfig: copy_config: no copytree ...................................................................... scripts/osmotestconfig: copy_config: no copytree In Osmocom git repositories, we have doc/example directories (possibly with subdirectories), which contain nothing but *.cfg files. For these directories, the code I'm removing had no effect: it would copy the whole directory tree of a directory containaing *.cfg files, but for some reason ignore the *.cfg files. I guess we had a previous directory structure before, where this made more sense. So essential it is a mkdir, but this is also not needed since we do a mkdir just below this. Furthermore this code caused problems for the related osmo-sgsn patch, where a *.cfg file is stored in the tests/ dir, because it has to be slightly different than the file from doc/example. In this case, the code would actually copy various files, such as Makefile.am, from the tests directory. This causes problems in "make distcheck", because then the file permissions are set so that these files cannot removed without first changing the permissions again. So osmotestconfig.py fails when it runs copy_config for the second time, trying to remove the temporary directory. Related: osmo-sgsn I309807ff0bc125d4653222b2b4ba69ded3bbff70 Change-Id: Ic312d546da1c21f68a80b6a188616ef9bc84f4c6 --- M scripts/osmotestconfig.py 1 file changed, 30 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 6580fc7..d2d1f03 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -70,9 +70,6 @@ def copy_config(dirname, config): if os.path.exists(dirname): shutil.rmtree(dirname) - ign = shutil.ignore_patterns('*.cfg') - shutil.copytree(os.path.dirname(config), dirname, ignore=ign) - os.chmod(dirname, stat.S_IRWXU) try: os.stat(dirname) -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36937?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic312d546da1c21f68a80b6a188616ef9bc84f4c6 Gerrit-Change-Number: 36937 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: copy_config: tweak mkdir
by osmith 28 May '24

28 May '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36938?usp=email ) Change subject: scripts/osmotestconfig: copy_config: tweak mkdir ...................................................................... scripts/osmotestconfig: copy_config: tweak mkdir Run os.mkdir unconditionally, checking if it exists is not needed as we run shutil.rmtree before. Change-Id: I555c6d55ee1e288767192f83408a1f132544c928 --- M scripts/osmotestconfig.py 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index d2d1f03..d6521ff 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -71,10 +71,7 @@ if os.path.exists(dirname): shutil.rmtree(dirname) - try: - os.stat(dirname) - except OSError: - os.mkdir(dirname) + os.mkdir(dirname) prefix = os.path.basename(config) tmpfile = tempfile.NamedTemporaryFile( -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36938?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I555c6d55ee1e288767192f83408a1f132544c928 Gerrit-Change-Number: 36938 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log