September 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: testenv: improve --config argument parsing

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38285?usp=email ) Change subject: testenv: improve --config argument parsing ...................................................................... testenv: improve --config argument parsing * Fix that it didn't complain about and invalid --config argument, as long as there was a valid --config argument before it. * Let raise_error_config_arg only output the invalid --config argument instead of all of them. * Complain if "--config all" is used in combination with another --config argument. Change-Id: I66b976b0332be523c084a6b5d38d0f62134b495d --- M _testenv/testenv/testenv_cfg.py 1 file changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/38285/1 diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 9642ae8..5124a47 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -134,14 +134,14 @@ get_vty_host_port(cfg, path) -def raise_error_config_arg(glob_result): +def raise_error_config_arg(glob_result, config_arg): valid = [] for path in glob_result: basename = os.path.basename(path) if basename != "testenv.cfg": valid += [basename.split("_", 1)[1].split(".", -1)[0]] - msg = f"Invalid parameter for --config: {testenv.args.config}" + msg = f"Invalid parameter for --config: {config_arg}" if valid: msg += f" (valid: all, {', '.join(valid)})" @@ -185,6 +185,8 @@ def init(): global cfgs + cfgs_all = {} + config_paths = find_configs() for path in config_paths: @@ -201,14 +203,24 @@ handle_latest(cfg, path) verify(cfg, path) + # No --config argument given, and there is only one testenv.cfg if not testenv.args.config: cfgs[basename] = cfg + return + + cfgs_all[basename] = cfg + + # Select configs based on --config argument(s) + for config_arg in testenv.args.config: + if config_arg == "all": + if len(testenv.args.config) != 1: + raise testenv.NoTraceException("Can't use multiple --config arguments if one of them is 'all'") + cfgs = cfgs_all + return + + basename = f"testenv_{config_arg}.cfg" + if basename in cfgs_all: + cfgs[basename] = cfgs_all[basename] continue - for config_arg in testenv.args.config: - if config_arg == "all" or f"testenv_{config_arg}.cfg" == basename: - cfgs[basename] = cfg - break - - if not cfgs: - raise_error_config_arg(config_paths) + raise_error_config_arg(config_paths, config_arg) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38285?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: I66b976b0332be523c084a6b5d38d0f62134b495d Gerrit-Change-Number: 38285 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: testenv: fix paths in copy= and clean=

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38282?usp=email ) Change subject: ggsn: testenv: fix paths in copy= and clean= ...................................................................... ggsn: testenv: fix paths in copy= and clean= I had moved osmo-ggsn related files to the osmo-ggsn directory and forgot to adjust testenv_osmo_ggsn_{v4,v6,v4v6}_only.cfg. Fix it by changing it like it is in testenv_osmo_ggsn_all.cfg Change-Id: Ibc8aeb43ff594a6b26699f81b29abc31b9b5b71f --- M ggsn_tests/testenv_osmo_ggsn_v4_only.cfg M ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg M ggsn_tests/testenv_osmo_ggsn_v6_only.cfg 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/38282/1 diff --git a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg index c9adef7..a3876ef 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg @@ -6,6 +6,6 @@ program=osmo-ggsn make=osmo-ggsn package=osmo-ggsn -copy=osmo-ggsn.src.cfg osmo-ggsn-v4_only.confmerge -clean=testenv.sh v4_only +copy=osmo-ggsn +clean=osmo-ggsn/testenv.sh v4_only vty_port=4260 diff --git a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg index cc23fcb..2244abb 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg @@ -6,6 +6,6 @@ program=osmo-ggsn make=osmo-ggsn package=osmo-ggsn -copy=osmo-ggsn.src.cfg osmo-ggsn-v4v6_only.confmerge -clean=testenv.sh v4v6_only +copy=osmo-ggsn +clean=osmo-ggsn/testenv.sh v4v6_only vty_port=4260 diff --git a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg index 6109595..d609b5d 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg @@ -6,6 +6,6 @@ program=osmo-ggsn make=osmo-ggsn package=osmo-ggsn -copy=osmo-ggsn.src.cfg osmo-ggsn-v6_only.confmerge -clean=testenv.sh v6_only +copy=osmo-ggsn +clean=osmo-ggsn/testenv.sh v6_only vty_port=4260 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38282?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: Ibc8aeb43ff594a6b26699f81b29abc31b9b5b71f Gerrit-Change-Number: 38282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months

1
0
0 0

[M] Change in pysim[master]: filesystem: pass total_len to construct of when encoding file contents

by dexter

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/38195?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: filesystem: pass total_len to construct of when encoding file contents ...................................................................... filesystem: pass total_len to construct of when encoding file contents In our construct models we frequently use a context parameter "total_len", we also pass this parameter to construct when we decode files, but we do not pass it when we generate files. This is a problem, because when total_len is used in the construct model, this parameter must be known also when decoding the file. Let's make sure that the total_len is properly determined and and passed to construct (via pyosmocom) Related: OS#5714 Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b --- M pySim/filesystem.py M pySim/gsm_r.py M pySim/runtime.py M pySim/sysmocom_sja2.py M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py 7 files changed, 94 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/38195/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b Gerrit-Change-Number: 38195 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

9 months

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 4: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Sep 2024 09:42:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 4: (1 comment) File src/osmocom/construct.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/38272/comment/74b9bf8f_ff69… : PS4, Line 633: val = tlv.bertlv_encode_len(obj) perhaps tlv.bertlv_encode_len() is not the correct API? When I get the docstring right, then it would encode a length value, but the obj is the value of the integer we want to encapsulate. That is why we get the 8180, when we try to encode 128. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Sep 2024 09:38:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: I have tested it, but it appears to be even more off. pySIM-shell (00:MF/ADF.ISD-R)> remove_notification_from_list 128 -> 80E2910007 bf300480028180 user@work:~/work/git_master/pysim$ ./contrib/unber.py --hex bf300480028180 bf30 l=4 80 l=2 8180 The length seems to be ok now, but the value does not look right. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 24 Sep 2024 09:26:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/{master,gerrit}: pyosmocom: run pysim tests

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38270?usp=email ) Change subject: jobs/{master,gerrit}: pyosmocom: run pysim tests ...................................................................... jobs/{master,gerrit}: pyosmocom: run pysim tests Related: OS#6572 Depends: pyosmocom I6bb7f137d3124e68574bc599969a8e7fd8b68904 Change-Id: I66a9f01382a788ae64adc60410ccbec9ec2dfc6b --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 40 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 0e05918..956cea6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -308,10 +308,27 @@ repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' pipeline_binpkgs: "debian:12" - a1_name: JOB_TYPE - a1: !!python/tuple ["test", "pylint", "docs"] + concurrent: false + slave_axis: !!python/tuple [simtester,osmocom-gerrit] + a2_name: JOB_TYPE + a2: !!python/tuple ["test", "pylint", "docs", "pysim"] + combination_filter: > + (JOB_TYPE == "test" && label == "osmocom-gerrit") || + (JOB_TYPE == "pylint" && label == "osmocom-gerrit") || + (JOB_TYPE == "docs" && label == "osmocom-gerrit") || + (JOB_TYPE == "pysim" && label == "simtester") cmd: | - {docker_run} -e JOB_TYPE="$JOB_TYPE" {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + case "$JOB_TYPE" in + "pysim") + {timeout_cmd} ./contrib/jenkins.sh + ;; + *) + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + {docker_img} \ + {timeout_cmd} /build/contrib/jenkins.sh + ;; + esac - osmo-sgsn: a1_name: IU diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 971b642..730c68c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -421,10 +421,27 @@ - pyosmocom: repos_url: '{gerrit_url}/python/{repos}' - a1_name: JOB_TYPE - a1: !!python/tuple ["test", "pylint", "docs"] + concurrent: false + slave_axis: !!python/tuple [simtester,osmocom-gerrit] + a2_name: JOB_TYPE + a2: !!python/tuple ["test", "pylint", "docs", "pysim"] + combination_filter: > + (JOB_TYPE == "test" && label == "osmocom-gerrit") || + (JOB_TYPE == "pylint" && label == "osmocom-gerrit") || + (JOB_TYPE == "docs" && label == "osmocom-gerrit") || + (JOB_TYPE == "pysim" && label == "simtester") cmd: | - {docker_run} -e JOB_TYPE="$JOB_TYPE" {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + case "$JOB_TYPE" in + "pysim") + {timeout_cmd} ./contrib/jenkins.sh + ;; + *) + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + {docker_img} \ + {timeout_cmd} /build/contrib/jenkins.sh + ;; + esac - osmo-sgsn: a1_name: IU -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38270?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: I66a9f01382a788ae64adc60410ccbec9ec2dfc6b Gerrit-Change-Number: 38270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

9 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/{master,gerrit}: pyosmocom: run pysim tests

by fixeria

Attention is currently required from: dexter, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38270?usp=email ) Change subject: jobs/{master,gerrit}: pyosmocom: run pysim tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I66a9f01382a788ae64adc60410ccbec9ec2dfc6b Gerrit-Change-Number: 38270 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Sep 2024 09:15:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months

1
0
0 0

[XS] Change in ...pyosmocom[master]: tag 0.0.5 for osmocom.construct.Asn1DerInteger

by osmith

Attention is currently required from: dexter, laforge. osmith has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38273?usp=email ) Change subject: tag 0.0.5 for osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I77914901d7f154d3a6e97c39575292e03453ddf7 Gerrit-Change-Number: 38273 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Sep 2024 08:53:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months

1
0
0 0

[S] Change in ...pyosmocom[master]: osmocom.construct.Asn1DerInteger

by osmith

Attention is currently required from: dexter, laforge. osmith has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email ) Change subject: osmocom.construct.Asn1DerInteger ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I0cfe97daf957919de86453d6d44f9c99ab3075ac Gerrit-Change-Number: 38272 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Sep 2024 08:53:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024