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

[S] Change in osmo-ttcn3-hacks[master]: sccp: Initial testenv

by laforge

Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39123?usp=email ) Change subject: sccp: Initial testenv ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39123?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: I616425d729dda342e78537c6b7256d5dddebaa88 Gerrit-Change-Number: 39123 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:58:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: sccp: Let some time for SCCP RLC to reach IUT before finishing test

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39126?usp=email ) Change subject: sccp: Let some time for SCCP RLC to reach IUT before finishing test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39126?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: Id7d5970bb0fe0e42fedcb56fe4a738a92ddd5bbf Gerrit-Change-Number: 39126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:57:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m fix export of AID-REF-DO (empty)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39057?usp=email ) Change subject: ara_m fix export of AID-REF-DO (empty) ...................................................................... ara_m fix export of AID-REF-DO (empty) GPD_SPE_013 Table 6-3 defines two types of AID-REF-DO objects (both are fully independed TLV IEs with the same name). The version with tag '4F' identifies an SE application. It may contain an AID prefix or even be of length 0 in case the rule should apply to all SE applications. Then there is the version with tag 'C0', which must always have length 0 and serves a flag to apply the rule to the implicitly selected SE application. Technically both are completely different things, so we must also treat them separately in the pySim-shell code. Related: OS#6681 Change-Id: I771d5e860b12215280e3d0a8c314ce843fe0d6a2 --- M pySim/ara_m.py M tests/pySim-shell_test/ara_m/adf_ara-m.cfg.ok M tests/pySim-shell_test/ara_m/adf_ara-m.script.ok M tests/pySim-shell_test/ara_m/test.script 4 files changed, 16 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ara_m.py b/pySim/ara_m.py index f4da31d..7a0f93f 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -320,9 +320,9 @@ '--device-app-id', required=True, help='Identifies the specific device application that the rule appplies to. Hash of Certificate of Application Provider, or UUID. (20/32 hex bytes)') aid_grp = store_ref_ar_do_parse.add_mutually_exclusive_group() aid_grp.add_argument( - '--aid', help='Identifies the specific SE application for which rules are to be stored. Can be a partial AID, containing for example only the RID. (5-16 hex bytes)') + '--aid', help='Identifies the specific SE application for which rules are to be stored. Can be a partial AID, containing for example only the RID. (5-16 or 0 hex bytes)') aid_grp.add_argument('--aid-empty', action='store_true', - help='No specific SE application, applies to all applications') + help='No specific SE application, applies to implicitly selected application (all channels)') store_ref_ar_do_parse.add_argument( '--pkg-ref', help='Full Android Java package name (up to 127 chars ASCII)') # AR-DO @@ -423,10 +423,13 @@ # matching key. if dictlist is None: return None - obj = None for d in dictlist: - obj = d.get(key, obj) - return obj + if key in d: + obj = d.get(key) + if obj is None: + return "" + return obj + return None @staticmethod def __export_ref_ar_do_list(ref_ar_do_list): @@ -437,6 +440,7 @@ if ref_do_list and ar_do_list: # Get ref_do parameters aid_ref_do = CardApplicationARAM.__export_get_from_dictlist('aid_ref_do', ref_do_list) + aid_ref_empty_do = CardApplicationARAM.__export_get_from_dictlist('aid_ref_empty_do', ref_do_list) dev_app_id_ref_do = CardApplicationARAM.__export_get_from_dictlist('dev_app_id_ref_do', ref_do_list) pkg_ref_do = CardApplicationARAM.__export_get_from_dictlist('pkg_ref_do', ref_do_list) @@ -447,9 +451,11 @@ # Write command-line export_str += "aram_store_ref_ar_do" - if aid_ref_do: + if aid_ref_do is not None and len(aid_ref_do) > 0: export_str += (" --aid %s" % aid_ref_do) - else: + elif aid_ref_do is not None: + export_str += " --aid \"\"" + if aid_ref_empty_do is not None: export_str += " --aid-empty" if dev_app_id_ref_do: export_str += (" --device-app-id %s" % dev_app_id_ref_do) diff --git a/tests/pySim-shell_test/ara_m/adf_ara-m.cfg.ok b/tests/pySim-shell_test/ara_m/adf_ara-m.cfg.ok index 5520a6b..a81f8fc 100644 --- a/tests/pySim-shell_test/ara_m/adf_ara-m.cfg.ok +++ b/tests/pySim-shell_test/ara_m/adf_ara-m.cfg.ok @@ -110,7 +110,7 @@ { "ref_do": [ { - "aid_ref_do": "ffffffffffdd" + "aid_ref_do": null }, { "dev_app_id_ref_do": "a1234567890123bb1f140de987aaa891bbbf0bdd" diff --git a/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok b/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok index 79c20eb..2296492 100644 --- a/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok +++ b/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok @@ -7,7 +7,7 @@ # Decoded FCP Template: None select MF/ADF.ARA-M aram_delete_all -aram_store_ref_ar_do --aid ffffffffffdd --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 +aram_store_ref_ar_do --aid "" --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 aram_store_ref_ar_do --aid ffffffffffcc --device-app-id a1234567890aaabb1f140de987657891a04f0bdd --apdu-filter aabbccdd01020304 --nfc-always --android-permissions 0000000000000004 aram_store_ref_ar_do --aid ffffffffffbb --device-app-id aa6872f28b340b2345678905d5c2bbd5a04f0bdd --apdu-always --nfc-always --android-permissions 0000000000000004 aram_store_ref_ar_do --aid ffffffffffaa --device-app-id aa6872787654334567840de535c2bbd5a04f0baa --apdu-never --nfc-never --android-permissions 0000000000000004 diff --git a/tests/pySim-shell_test/ara_m/test.script b/tests/pySim-shell_test/ara_m/test.script index e6db749..2b59925 100644 --- a/tests/pySim-shell_test/ara_m/test.script +++ b/tests/pySim-shell_test/ara_m/test.script @@ -10,7 +10,7 @@ aram_store_ref_ar_do --aid ffffffffffaa --device-app-id aa6872787654334567840de535c2bbd5a04f0baa --apdu-never --nfc-never --android-permissions 0000000000000004 aram_store_ref_ar_do --aid ffffffffffbb --device-app-id aa6872f28b340b2345678905d5c2bbd5a04f0bdd --apdu-always --nfc-always --android-permissions 0000000000000004 aram_store_ref_ar_do --aid ffffffffffcc --device-app-id a1234567890aaabb1f140de987657891a04f0bdd --apdu-filter aabbccdd01020304 --nfc-always --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffdd --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 +aram_store_ref_ar_do --aid "" --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 # Export ADF.ARA-M to a temporary script file export --filename ADF.ARA-M > adf_ara-m.script.tmp -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39057?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I771d5e860b12215280e3d0a8c314ce843fe0d6a2 Gerrit-Change-Number: 39057 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

6 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ara_m fix export of AID-REF-DO (empty)

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39057?usp=email ) Change subject: ara_m fix export of AID-REF-DO (empty) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39057?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I771d5e860b12215280e3d0a8c314ce843fe0d6a2 Gerrit-Change-Number: 39057 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:57:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-obs: update descriptions

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39141?usp=email ) Change subject: jobs/osmocom-obs: update descriptions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39141?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: I311c7e5194b1ef516ab54972383f03730b8cd6f2 Gerrit-Change-Number: 39141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:56:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... remsim: bankd: Install vsmartcard-vpcd This is needed for test RemsimBankd_Tests.TC_createMapping_exchangeTPDU to work. Add require_vsmartcard_vpcd.sh to give a meaningful error message when running without --podman, if the user doesn't have it installed. Co-authored-by: Oliver Smith <osmith(a)sysmocom.de> Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/require_vsmartcard_vpcd.sh M remsim/testenv_bankd.cfg 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 5321bfe..3b0afb1 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -85,6 +85,7 @@ sudo \ tcpdump \ vim \ + vsmartcard-vpcd \ wget \ wireshark-common \ && \ diff --git a/_testenv/data/scripts/require_vsmartcard_vpcd.sh b/_testenv/data/scripts/require_vsmartcard_vpcd.sh new file mode 100755 index 0000000..11a6530 --- /dev/null +++ b/_testenv/data/scripts/require_vsmartcard_vpcd.sh @@ -0,0 +1,11 @@ +#!/bin/sh +SO="/usr/lib/pcsc/drivers/serial/libifdvpcd.so" + +if ! [ -e "$SO" ]; then + echo + echo "ERROR: $SO not found!" + echo + echo "This testsuite requires vsmartcard-vpcd." + echo + exit 1 +fi diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg index 62ac07b..484203c 100644 --- a/remsim/testenv_bankd.cfg +++ b/remsim/testenv_bankd.cfg @@ -3,6 +3,7 @@ config=bankd/REMSIM_Tests.cfg [pcscd] +prepare=require_vsmartcard_vpcd.sh program=pcscd -f -d make=no package=pcscd -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?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: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?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: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:22:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-obs: update descriptions

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39141?usp=email ) Change subject: jobs/osmocom-obs: update descriptions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39141?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: I311c7e5194b1ef516ab54972383f03730b8cd6f2 Gerrit-Change-Number: 39141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 18:20:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-obs: update descriptions

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39141?usp=email ) Change subject: jobs/osmocom-obs: update descriptions ...................................................................... jobs/osmocom-obs: update descriptions Describe when which job gets triggered, and whether it is fine to trigger them manually. Change-Id: I311c7e5194b1ef516ab54972383f03730b8cd6f2 --- M jobs/osmocom-obs.yml 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/41/39141/1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index e61b16b..39fa5fb 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -1,17 +1,30 @@ --- - project: name: Osmocom_OBS + description_extra: "" jobs: - Osmocom_OBS_{type} type: - master: conflict_version: "" + description_extra: | + This job gets triggered by jenkins whenever something gets merged + to master. - nightly: # For nightly we don't provide ABI compatibility, make sure packages # from different build dates are not mixed by accident conflict_version: "$(date +%Y%m%d%H%M)" + description_extra: | + This job gets triggered every night. + Do not trigger manually! This causes a rebuild of ALL packages + for ALL supported Linux distributions and architectures, and should + only run once every night! - latest: conflict_version: "" + description_extra: | + This job gets triggered every night. + Triggering this manually after making a release is fine, because + only the packages that have a new version will be built. - job-template: name: 'Osmocom_OBS_{type}' @@ -20,7 +33,7 @@ defaults: global description: | See <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">Wiki: binary packages</a> - for more information. + for more information. {description_extra} properties: - build-discarder: days-to-keep: 30 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39141?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: I311c7e5194b1ef516ab54972383f03730b8cd6f2 Gerrit-Change-Number: 39141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by osmith

Attention is currently required from: laforge, osmith, pespin. osmith has uploaded a new patch set (#3) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by osmith Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... remsim: bankd: Install vsmartcard-vpcd This is needed for test RemsimBankd_Tests.TC_createMapping_exchangeTPDU to work. Add require_vsmartcard_vpcd.sh to give a meaningful error message when running without --podman, if the user doesn't have it installed. Co-authored-by: Oliver Smith <osmith(a)sysmocom.de> Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/require_vsmartcard_vpcd.sh M remsim/testenv_bankd.cfg 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/39135/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?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: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024