- gerrit-log - lists.osmocom.org

[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck
by osmith 27 May '24

27 May '24

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck ...................................................................... Abandoned figured it out! proper fix: https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36937 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?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: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/37/36937/1 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-MessageType: newchange

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/38/36938/1 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-MessageType: newchange

1 0

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig: remove_tmpdir -> shutil.rmtree
by osmith 27 May '24

27 May '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36939?usp=email ) Change subject: scripts/osmotestconfig: remove_tmpdir -> shutil.rmtree ...................................................................... scripts/osmotestconfig: remove_tmpdir -> shutil.rmtree Change-Id: I7cc133b622f863e807da9da04965a0f6f3f6d877 --- M scripts/osmotestconfig.py 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/39/36939/1 diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index d6521ff..aa926f1 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -124,10 +124,6 @@ return os.path.exists(cmd) -def remove_tmpdir(tmpdir): - shutil.rmtree(tmpdir) - - def check_configs_tested(basedir, app_configs, ignore_configs): configs = [] for root, dirs, files in os.walk(basedir): @@ -156,7 +152,7 @@ config = os.path.join(confpath, config) test_config(app, config, tmpdir, verbose) - remove_tmpdir(tmpdir) + shutil.rmtree(tmpdir) if __name__ == '__main__': -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36939?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: I7cc133b622f863e807da9da04965a0f6f3f6d877 Gerrit-Change-Number: 36939 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/35/36935/1 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-MessageType: newchange

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/36/36936/1 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-MessageType: newchange

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/34/36934/1 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-MessageType: newchange

1 0

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

27 May '24

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email to look at the new patch set (#6). 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: 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/45/36845/6 -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(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-MessageType: newpatchset

1 0

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

27 May '24

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/36933?usp=email ) Change subject: Bump version: 1.14.3.3-16b4-dirty → 1.14.4 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: GCC was upgraded in Debian Unstable, the latest release fails to build now: ``` [ 171s] ../test_apps/esme.h:32:16: error: implicit declaration of function 'strtol'; did you mean 'strtok'? [-Werror=implicit-function-declaration] ``` https://obs.osmocom.org/package/live_build_log/osmocom:latest/libsmpp34/Deb… Vadim already patched it on master. Tag a patch release to get the fix into the latest release. -- 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-Comment-Date: Mon, 27 May 2024 09:20:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

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

27 May '24

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/33/36933/1 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-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log