- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Obtain amf_id from NGAP_Emulation
by pespin 20 Aug '25

20 Aug '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40891?usp=email ) Change subject: 5gc: Obtain amf_id from NGAP_Emulation ...................................................................... 5gc: Obtain amf_id from NGAP_Emulation This will be needed in a follow-up commit in order to be able to transmit UE Context Release Request. Change-Id: I49cb6d7fe9f18734c49bb49ecceb671e8122ce88 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M library/NGAP_Emulation.ttcn 3 files changed, 52 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/40891/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 0b71059..608bcf8 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -86,6 +86,8 @@ usim_key := mp_usim_key, usim_opc := mp_usim_opc, apn := mp_apn, + ran_id := idx, + amf_id := omit, run_prog_pars := ts_RunProgParams(idx), ran_gtpu_ip := mp_local_gtpu_ip, ran_gtpu_teid := int2oct(idx + 1, 4), diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 01dcb1a..2f3344b 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -73,6 +73,8 @@ octetstring usim_key, octetstring usim_opc, charstring apn, + RAN_UE_NGAP_ID ran_id, + AMF_UE_NGAP_ID amf_id optional, RunProgParams run_prog_pars, charstring ran_gtpu_ip, OCT4 ran_gtpu_teid, @@ -308,10 +310,11 @@ private altstep as_ngap_handle_InitialCtxReq_withPDUSessionList() runs on ConnHdlr { var NGAP_PDU rx_ngap; + var template (present) NGAP_PDU exp_ngap := + mw_ngap_initMsg(mw_n2_InitialContextSetupRequest_withPDUSessionList(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id)); - [] NGAP.receive(mw_ngap_initMsg(mw_n2_InitialContextSetupRequest_withPDUSessionList)) -> value rx_ngap { - var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); - var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); + [] NGAP.receive(exp_ngap) -> value rx_ngap { var InitialContextSetupRequest ctx_setup_req := rx_ngap.initiatingMessage.value_.initialContextSetupRequest; var PDUSessionResourceSetupListCxtRes resources; @@ -322,7 +325,9 @@ var PDUSessionResourceSetupListCxtReq li := ctx_setup_req.protocolIEs[i].value_.pDUSessionResourceSetupListCxtReq; resources := f_pdu_handle_session_resource_setup_list(li); } - NGAP.send(m_ngap_succMsg(m_n2_InitialContextSetupResponse(amf_id, ran_id, resources))); + NGAP.send(m_ngap_succMsg(m_n2_InitialContextSetupResponse(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + resources))); } } @@ -369,7 +374,7 @@ f_SUCI_IMSI()), p_UESecurityCap := f_UE_SecurityCapability()); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); - tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.ue_pars.idx, + tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.ue_pars.ran_id, nas_pdu, /* Registration request */ f_ULI(), mo_Signalling)); @@ -388,6 +393,9 @@ as_ngap_handle_auth(); as_ngap_handle_sec_mode(); + /* After receiving DL NAS Transport above, the UE-AMF-Id became known in NGAP_Emulation: */ + g_pars.ue_pars.amf_id := f_ngap_obtain_amf_id(); + NGAP.receive(cr_NG_REGISTRATION_ACCEPT) -> value rx_nas; g_pars.ue_pars.guti := rx_nas.registration_Accept.guti.otherDigits; NGAP.send(cs_NG_REGISTRATION_COMPLETE); @@ -443,11 +451,16 @@ /* 3GPP TS 38.413 8.3.3 UE Context Release (AMF initiated) */ private altstep as_ngap_handle_UeContextReleaseCmd() runs on ConnHdlr { var NGAP_PDU rx_ngap; + var template (present) NGAP_PDU exp_ngap := + mw_ngap_initMsg(mw_n2_UEContextReleaseCommand( + mw_uE_NGAP_IDs_uE_NGAP_ID_pair( + mw_uE_NGAP_ID_pair(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id)))); - [] NGAP.receive(mw_ngap_initMsg(mw_n2_UEContextReleaseCommand)) -> value rx_ngap { - var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); - var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); - NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(amf_id, ran_id, f_ULI()))); + [] NGAP.receive(exp_ngap) -> value rx_ngap { + NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + f_ULI()))); } } @@ -484,10 +497,12 @@ private altstep as_ngap_handle_PDUSessionReleaseCommand() runs on ConnHdlr { var NGAP_PDU rx_ngap; + var template (present) NGAP_PDU exp_ngap := + mw_ngap_initMsg(f_tr_n2_PDUSessionResourceReleaseCommand(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + ?, ?)); - [] NGAP.receive(mw_ngap_initMsg(f_tr_n2_PDUSessionResourceReleaseCommand(?, ?, ?, ?))) -> value rx_ngap { - var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); - var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); + [] NGAP.receive(exp_ngap) -> value rx_ngap { var PDUSessionResourceReleaseCommand rel_cmd := rx_ngap.initiatingMessage.value_.PDUSessionResourceReleaseCommand; var PDUSessionResourceReleasedListRelRes resources; @@ -498,7 +513,9 @@ var PDUSessionResourceToReleaseListRelCmd li := rel_cmd.protocolIEs[i].value_.pDUSessionResourceToReleaseListRelCmd; resources := f_pdu_handle_session_resource_released_list(li); } - NGAP.send(m_ngap_succMsg(m_n2_PDUSessionResourceReleaseResponse(amf_id, ran_id, resources))); + NGAP.send(m_ngap_succMsg(m_n2_PDUSessionResourceReleaseResponse(g_pars.ue_pars.amf_id, + g_pars.ue_pars.ran_id, + resources))); } } diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index aa4b485..3034fab 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -116,11 +116,13 @@ signature NGAPEM_register(in AMF_UE_NGAP_ID amf_id, in RAN_UE_NGAP_ID ran_id, in NGAP_ConnHdlr hdlr); signature NGAPEM_register_proc(in integer procedureCode, in NGAP_ConnHdlr hdlr); +signature NGAPEM_obtain_amf_id() return AMF_UE_NGAP_ID; //signature NGAPEM_derive_nas_token(in octetstring kasme, in NGAP_ConnHdlr hdlr, out OCT32 nas_token); type port NGAPEM_PROC_PT procedure { inout NGAPEM_register; inout NGAPEM_register_proc; + inout NGAPEM_obtain_amf_id; //inout NGAPEM_derive_nas_token; } with { extension "internal" }; @@ -605,6 +607,11 @@ f_create_expect_proc(procedureCode, vc_conn); NGAP_PROC.reply(NGAPEM_register_proc:{procedureCode, vc_conn}) to vc_conn; } + [] NGAP_PROC.getcall(NGAPEM_obtain_amf_id:{}) -> sender vc_conn { + var integer i := f_assoc_id_by_comp(vc_conn); + amf_id := NGapAssociationTable[i].amf_ue_ngap_id; + NGAP_PROC.reply(NGAPEM_obtain_amf_id:{} value amf_id) to vc_conn; + } // [] NGAP_PROC.getcall(NGAPEM_derive_nas_token:{?, ?, -}) -> param(kasme, vc_conn) { // var integer assoc_id := f_assoc_id_by_comp(vc_conn); // var OCT32 nas_token := f_kdf_nas_token(kasme, NGapAssociationTable[assoc_id].nus.tx_count) @@ -701,4 +708,17 @@ } } +/* ConnHdlr function to obtain AMF_ID internally stored in association table. + * This is needed because we don't receive NGAP layer of DownlinkNasTransport in + * ConnHdlr from Emulation, so there's no direct way to obtain it early during + * registration procedure. */ +function f_ngap_obtain_amf_id() runs on NGAP_ConnHdlr return AMF_UE_NGAP_ID { + var AMF_UE_NGAP_ID amf_id; + NGAP_PROC.call(NGAPEM_obtain_amf_id:{}) { + [] NGAP_PROC.getreply(NGAPEM_obtain_amf_id:{}) -> value amf_id { + return amf_id; + } + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40891?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: I49cb6d7fe9f18734c49bb49ecceb671e8122ce88 Gerrit-Change-Number: 40891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: ngap: Add template for UEContextReleaseReq without PDU Session List
by pespin 20 Aug '25

20 Aug '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40890?usp=email ) Change subject: ngap: Add template for UEContextReleaseReq without PDU Session List ...................................................................... ngap: Add template for UEContextReleaseReq without PDU Session List That's the only optional IE in the message. Add a separate template to be able to transmit with that IE set, similar to what's already done in m_n2_InitialContextSetupRequest_withPDUSessionList(). Change-Id: I0f1a549103b70bcd373dcd4c688761d3eeef10a6 --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/40890/1 diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index d6e0bd8..9729823 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -1772,6 +1772,36 @@ template (value) InitiatingMessage m_n2_UEContextReleaseRequest( in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + in template (value) Cause p_cause + ) := { + procedureCode := id_UEContextReleaseRequest, + criticality := ignore, + value_ := { + UEContextReleaseRequest := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := reject, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := reject, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + }, + { + id := id_Cause, + criticality := ignore, + value_ := { Cause := p_cause } + } + } + } + } + } // End of template m_n2_UEContextReleaseRequest + + template (value) InitiatingMessage m_n2_UEContextReleaseRequest_withPDUSessionList( + in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, in template (value) PDUSessionResourceListCxtRelReq p_pDUSessionResourceListCxtRelReq, in template (value) Cause p_cause ) := { @@ -1803,7 +1833,7 @@ } } } - } // End of template m_n2_UEContextReleaseRequest + } // End of template m_n2_UEContextReleaseRequest_withPDUSessionList } // End of group Send -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40890?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: I0f1a549103b70bcd373dcd4c688761d3eeef10a6 Gerrit-Change-Number: 40890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by pespin 20 Aug '25

20 Aug '25

Attention is currently required from: falconia, jolly. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (1 comment) File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/47567b20_09a9b82… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); > Fair enough: I'll add this option to the next iteration of the present patchset. […] @falcon@freecalypso.org yes several people I know, not only you, (eg. me and @vyanitskiy@sysmocom.de) are happy to get rid of ortp dependency since it creates a lot of hassle to maintain, and yes, I was expecting you to submit a patch against osmo-bts to drop ortp and use twrtp instead (tbh I don't recall now if you already submitted that since a lot of time has happened?). Now I hope you understand better my point regarding support M bit. If we find more not envisioned problematic interop scenarios later on I'm sure we can extend twrtp out of that "closed-minded approach of emulating TDM" in order to get those fixed/improved. AFAIK nobody her anyway looked at full internals of ortp to make sure everything is 100% correct there. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 20 Aug 2025 15:38:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by falconia 20 Aug '25

20 Aug '25

Attention is currently required from: jolly, pespin. falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (1 comment) File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/c2538103_aacded0… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); Fair enough: I'll add this option to the next iteration of the present patchset. However, something to note a little more generally: > from experience I recall due to how some 3rd party CN generates RTP this will be needed. Should I interpret this comment as meaning that if these patches were to be merged (the present patchset, then OsmoBTS patches to allow selection between ortp and twrtp), then you anticipate the option of twrtp (instead of ortp) to be used by more than just those who choose to use the full Osmocom+ThemWi stack? IOW, do you expect some users of non-ThemWi Osmo-interfacing CN to switch from ortp to twrtp when the latter becomes available as an option? If so, then two responses from me: * On the one hand, I would be delighted to see my contribution used in such totally unexpected way; * On the other hand, I would be highly concerned that twjit won't work well in that environment - it is really not designed for any applications outside my closed-minded (if you wish to call it so) approach of emulating TDM. Sure, I'll add the option to act on M bit like you ask, treating it as handover - but are you sure there won't be other show-stoppers that would break the use of twjit in environments that aren't TDM-minded like ThemWi? That non-ThemWi CN you are thinking of, will it ever emit a sequence of gap, then a lonely packet (e.g., periodic comfort noise update), then another gap? If so, then twjit will not handle it well - see the last bulleted paragraph in document section 2.3.5. Also, are there really people other than me who would want to use something other ortp in OsmoBTS? I thought everyone other than me were totally happy with ortp and hence would have no desire to use twrtp+twjit instead... -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 12:01:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-netif[master]: bring twjit into libosmo-netif
by pespin 20 Aug '25

20 Aug '25

Attention is currently required from: falconia, jolly. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email ) Change subject: bring twjit into libosmo-netif ...................................................................... Patch Set 5: (1 comment) File src/twjit.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39280/comment/091b8e55_400f6bb… : PS2, Line 504: rtph = osmo_rtp_get_hdr(msg); > The problem with your argument is that it violates the fundamental model of how twrtp+twjit solution […] As mentioned already, I'm fine with having an API+VTY to be able to tweak the behavior between considering M bit and your behavior "emulate, as faithfully as possible a true circuit-switched TDM connection". I want to have the possibility to take into account M bits since from experience I recall due to how some 3rd party CN generates RTP this will be needed. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia3be5834571ca18b68939abbcf1ce3a879156658 Gerrit-Change-Number: 39280 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 20 Aug 2025 11:01:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: support security.d.o
by osmith 20 Aug '25

20 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40887?usp=email ) Change subject: OBS: sync_obs_projects: support security.d.o ...................................................................... OBS: sync_obs_projects: support security.d.o The Debian 13 meta config in the OpenSUSE OBS now lists security.debian.org. Adjust the script that syncs the config to support this URL too, rewrite it to HTTPS just like the other mirror URL. Fix for: changing url to https: http://security.debian.org/debian-security?dist=trixie-security&component=m… Traceback (most recent call last): File "/obs/sync_obs_projects.py", line 322, in <module> main() File "/obs/sync_obs_projects.py", line 312, in main rewrite_meta(project) File "/obs/sync_obs_projects.py", line 190, in rewrite_meta assert url.startswith("http://ftp.de.debian.org/debian"), \ AssertionError: unexpected mirror URL Related: https://build.opensuse.org/projects/Debian:13/meta Change-Id: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 --- M scripts/obs/sync_obs_projects.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index 732fa02..bf6b0b7 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -187,10 +187,14 @@ for download in repository.findall(".download"): url = download.get("url") print(f" changing url to https: {url}") - assert url.startswith("http://ftp.de.debian.org/debian"), \ - "unexpected mirror URL" - download.set("url", url.replace("http://ftp.de.debian.org/debian", - "https://debian.inf.tu-dresden.de/debian")) + if url.startswith("http://ftp.de.debian.org/debian"): + download.set("url", url.replace("http://ftp.de.debian.org/debian", + "https://debian.inf.tu-dresden.de/debian")) + elif url.startswith("http://security.debian.org/debian-security"): + download.set("url", url.replace("http://security.debian.org/debian-security", + "https://debian.inf.tu-dresden.de/debian-security")) + else: + raise RuntimeError(f"Unexpected mirror URL: {url}") for pubkey in download.findall("pubkey"): download.remove(pubkey) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40887?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: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 Gerrit-Change-Number: 40887 Gerrit-PatchSet: 1 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>

1 0

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by osmith 20 Aug '25

20 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... scripts/obs/sync_obs_projects.py: format with ruff Change-Id: I1b7281b32c352b09a0641175b6f70751010800d9 --- M .ruff.toml M scripts/obs/sync_obs_projects.py 2 files changed, 96 insertions(+), 53 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/.ruff.toml b/.ruff.toml index 6f6bd68..d8e72e2 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -18,7 +18,6 @@ "scripts/obs/lib/osc.py", "scripts/obs/lib/rpm_spec.py", "scripts/obs/lib/srcpkg.py", - "scripts/obs/sync_obs_projects.py", "scripts/obs/update_obs_project.py", "scripts/osmo-depcheck/buildstack.py", "scripts/osmo-depcheck/config.py", diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index bf6b0b7..d494ed4 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -23,34 +23,57 @@ def parse_args(): - parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf," - " meta) from another instance (OS#6165)") - parser.add_argument("-d", "--docker", - help="run in docker to avoid installing required pkgs", - action="store_true") - parser.add_argument("-n", "--no-skip-up-to-date", - dest="skip_up_to_date", action="store_false", - help="always assume projects are outdated") - parser.add_argument("-v", "--verbose", action="store_true", - help="always print shell commands and their output," - " instead of only printing them on error") - parser.add_argument("projects", - help="source OBS project, e.g. Debian:12", - nargs="+") + parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf, meta) from another instance (OS#6165)") + parser.add_argument( + "-d", + "--docker", + help="run in docker to avoid installing required pkgs", + action="store_true", + ) + parser.add_argument( + "-n", + "--no-skip-up-to-date", + dest="skip_up_to_date", + action="store_false", + help="always assume projects are outdated", + ) + parser.add_argument( + "-v", + "--verbose", + action="store_true", + help="always print shell commands and their output, instead of only printing them on error", + ) + parser.add_argument( + "projects", + help="source OBS project, e.g. Debian:12", + nargs="+", + ) advanced = parser.add_argument_group("advanced options") - advanced.add_argument("-A", "--apiurl", help="source OBS API URL" - " (default: https://api.opensuse.org)", - default="https://api.opensuse.org") - advanced.add_argument("-p", "--prefix", default="openSUSE.org-mirror", - help="destination OBS prefix" - " (default: openSUSE.org-mirror)") - advanced.add_argument("-t", "--to-apiurl", help="destination OBS API URL" - " (default: https://obs.osmocom.org)", - default="https://obs.osmocom.org") - advanced.add_argument("-w", "--weburl", default="https://build.opensuse.org", - help="source OBS web URL (default:" - " https://build.opensuse.org)") + advanced.add_argument( + "-A", + "--apiurl", + help="source OBS API URL (default: https://api.opensuse.org)", + default="https://api.opensuse.org", + ) + advanced.add_argument( + "-p", + "--prefix", + default="openSUSE.org-mirror", + help="destination OBS prefix (default: openSUSE.org-mirror)", + ) + advanced.add_argument( + "-t", + "--to-apiurl", + help="destination OBS API URL (default: https://obs.osmocom.org)", + default="https://obs.osmocom.org", + ) + advanced.add_argument( + "-w", + "--weburl", + default="https://build.opensuse.org", + help="source OBS web URL (default: https://build.opensuse.org)", + ) args = parser.parse_args() lib.set_args(args) @@ -79,9 +102,9 @@ def generate_prjconf_header(project): - """ This header gets prepended to the prjconf, before it gets written to - the destination OBS. This script uses it to determine whether the - project needs to be updated next time it runs. """ + """This header gets prepended to the prjconf, before it gets written to + the destination OBS. This script uses it to determine whether the + project needs to be updated next time it runs.""" with open(temp_source_prjconf, "rb") as h: source_prjconf = h.read() with open(temp_source_meta, "rb") as h: @@ -128,10 +151,12 @@ if project.startswith("Raspbian:"): return ["armv7l"] - return ["aarch64", - "armv7l", - "i586", - "x86_64"] + return [ + "aarch64", + "armv7l", + "i586", + "x86_64", + ] def rewrite_meta(project): @@ -147,9 +172,11 @@ for description in root.findall("description"): href = f"{lib.args.weburl}/project/show/{project}" - description.text = ("This project gets synced from:" - f" <a href='{html.escape(href)}'>{project}</a>\n" - "Do not modify manually. See OS#6165.\n") + description.text = ( + "This project gets synced from:" + f" <a href='{html.escape(href)}'>{project}</a>\n" + "Do not modify manually. See OS#6165.\n" + ) for repository in root.findall(".repository"): repo_name = repository.get("name") @@ -188,11 +215,21 @@ url = download.get("url") print(f" changing url to https: {url}") if url.startswith("http://ftp.de.debian.org/debian"): - download.set("url", url.replace("http://ftp.de.debian.org/debian", - "https://debian.inf.tu-dresden.de/debian")) + download.set( + "url", + url.replace( + "http://ftp.de.debian.org/debian", + "https://debian.inf.tu-dresden.de/debian", + ), + ) elif url.startswith("http://security.debian.org/debian-security"): - download.set("url", url.replace("http://security.debian.org/debian-security", - "https://debian.inf.tu-dresden.de/debian-security")) + download.set( + "url", + url.replace( + "http://security.debian.org/debian-security", + "https://debian.inf.tu-dresden.de/debian-security", + ), + ) else: raise RuntimeError(f"Unexpected mirror URL: {url}") for pubkey in download.findall("pubkey"): @@ -256,11 +293,15 @@ return # Show prjconf diff (old prjconf was retrieved in is_up_to_date()) - diff = lib.run_cmd(["colordiff", - "-c3", - temp_dest_old_prjconf, - temp_dest_new_prjconf], - check=False) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + temp_dest_old_prjconf, + temp_dest_new_prjconf, + ], + check=False, + ) if diff.returncode: print(f"{project_new}: prjconf changes:") print(diff.output, end="") @@ -270,13 +311,16 @@ # Show meta diff lib.osc.get_meta(temp_dest_old_meta) for file in [temp_dest_old_meta, temp_dest_new_meta]: - lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", - shell=True) - diff = lib.run_cmd(["colordiff", - "-c3", - f"{temp_dest_old_meta}.pretty", - f"{temp_dest_new_meta}.pretty"], - check=False) + lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", shell=True) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + f"{temp_dest_old_meta}.pretty", + f"{temp_dest_new_meta}.pretty", + ], + check=False, + ) if diff.returncode: print(f"{project_new}: meta changes:") print(diff.output, end="") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 Gerrit-PatchSet: 1 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>

1 0

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by fixeria 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 Gerrit-PatchSet: 1 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: Wed, 20 Aug 2025 10:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: support security.d.o
by fixeria 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40887?usp=email ) Change subject: OBS: sync_obs_projects: support security.d.o ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40887?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: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 Gerrit-Change-Number: 40887 Gerrit-PatchSet: 1 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: Wed, 20 Aug 2025 10:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add email parameter
by osmith 20 Aug '25

20 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40886?usp=email ) Change subject: jobs/osmocom-obs-sync: add email parameter ...................................................................... jobs/osmocom-obs-sync: add email parameter Change-Id: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec --- M jobs/osmocom-obs-sync.yml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index 399f7ff..ade61b1 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -17,6 +17,10 @@ name: CI_BRANCH description: osmo-ci.git branch default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed job notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' scm: - git: branches: @@ -52,4 +56,4 @@ publishers: - email: notify-every-unstable-build: true - recipients: 'jenkins-notifications(a)lists.osmocom.org' + recipients: '$EMAIL_NOTIFICATIONS' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40886?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: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec Gerrit-Change-Number: 40886 Gerrit-PatchSet: 1 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>

1 0

2026

2025

2024

2023

2022

gerrit-log