- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: Fix Dynamic test case error returning unbound...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?usp=email ) Change subject: library/MGCP_Emulation: Fix Dynamic test case error returning unbound value ...................................................................... library/MGCP_Emulation: Fix Dynamic test case error returning unbound value As spotted today while running HNBGW_Tests.TC_rab_assignment, probably after upgrade to titan 11: 17:54:36.223786 1570 MGCP_Emulation.ttcn:241 Dynamic test case error: Copying an unbound charstring value. The error happened because in that failure path the component running the function was not stopped, and hence an unset variable was returned. Hence, make sure we tear everything down (including component going through the failure path). Change-Id: Id1d28924e90ed80199b61a143dac35fc6f50de68 --- M library/MGCP_Emulation.ttcn 1 file changed, 29 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index 7106f63..8dd3d3f 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -35,6 +35,7 @@ import from MGCP_Templates all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; type component MGCP_ConnHdlr { /* Simple send/recv without caring about peer addr+port. Used with multi_conn_mode=false. */ @@ -149,8 +150,9 @@ return MgcpEndpointTable[i].comp_ref; } } - setverdict(fail, "MGCP Endpoint Table not found by Endpoint", ep); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table not found by Endpoint", ep)); + return MgcpEndpointTable[0].comp_ref; /* Make compiler happy returning something */ } private function f_ep_by_comp(MGCP_ConnHdlr client) @@ -161,8 +163,9 @@ return MgcpEndpointTable[i].endpoint; } } - setverdict(fail, "MGCP Endpoint Table not found by component ", client); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table not found by component ", client)); + return MgcpEndpointTable[0].endpoint; /* Make compiler happy returning something */ } private function f_ep_table_add(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -175,7 +178,7 @@ return; } } - testcase.stop("MGCP Endpoint Table full!"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP Endpoint Table full!"); } private function f_ep_table_del(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -189,8 +192,8 @@ return; } } - setverdict(fail, "MGCP Endpoint Table: Couldn't find to-be-deleted entry!"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table: Couldn't find to-be-deleted entry!")); } private function f_ep_table_change_connhdlr(MGCP_ConnHdlr comp_ref, MgcpEndpoint ep) @@ -203,8 +206,8 @@ return; } } - setverdict(fail, "MGCP Endpoint Table: Couldn't find entry to move to ", comp_ref); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("MGCP Endpoint Table: Couldn't find entry to move to ", comp_ref)); } /* Check if the given transaction ID is a pending CRCX. If yes, return true + remove */ @@ -235,8 +238,8 @@ } else { var MgcpEndpoint ep; if (f_mgcp_find_param(msg, "Z", ep) == false) { - setverdict(fail, "No SpecificEndpointName in MGCP response", msg); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No SpecificEndpointName in MGCP response", msg)); } return ep; } @@ -280,8 +283,8 @@ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, -1, { udp:={} }); } if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect MGCP socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect MGCP socket, check your configuration")); } g_mgcp_conn_id := res.connId; @@ -329,8 +332,8 @@ p.callagent_udp_port := mrf.remPort; res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, g_mgcp_conn_id, { udp:={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect MGCP socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect MGCP socket, check your configuration")); } } if (ischosen(mrf.msg.command)) { @@ -358,8 +361,8 @@ } } } else { - setverdict(fail, "Received unexpected MGCP response: ", mrf.msg.response); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected MGCP response: ", mrf.msg.response)); } } [] MGCP_PROC.getcall(MGCPEM_register:{?,?}) -> param(crit, vc_conn) { @@ -448,8 +451,9 @@ return ret; } } - setverdict(fail, "Couldn't find Expect for CRCX", cmd); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Couldn't find Expect for CRCX", cmd)); + return MgcpExpectTable[0].vc_conn; /* Make compiler happy returning something */ } private function f_create_expect(ExpectCriteria crit, MGCP_ConnHdlr hdlr) @@ -459,8 +463,8 @@ /* Check an entry like this is not already present */ for (i := 0; i < sizeof(MgcpExpectTable); i := i+1) { if (crit == MgcpExpectTable[i].crit) { - setverdict(fail, "Crit already present", crit); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Crit already present", crit)); } } for (i := 0; i < sizeof(MgcpExpectTable); i := i+1) { @@ -471,7 +475,7 @@ return; } } - testcase.stop("No space left in MgcpExpectTable") + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "No space left in MgcpExpectTable"); } /* client/conn_hdlr side function to use procedure port to create expect in emulation */ @@ -528,8 +532,9 @@ return "AMR-WB"; } - setverdict(fail, "Unknown payload type ", pt); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknown payload type ", pt)); + return ""; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?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: Id1d28924e90ed80199b61a143dac35fc6f50de68 Gerrit-Change-Number: 40417 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

3 weeks, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: Fix Dynamic test case error returning unbound...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?usp=email ) Change subject: library/MGCP_Emulation: Fix Dynamic test case error returning unbound value ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417/comment/1d49e65d_0b3c… : PS1, Line 10: MGCP_Emulation.ttcn:241 Dynamic test case error: Copying an unbound charstring value. BTW, this is due to a bug in TITAN 11.0.0: https://paste.debian.net/1377895/ (`TC_selftest` is failing) which has been fixed (https://gitlab.eclipse.org/eclipse/titan/titan.core/-/issues/752) in 11.1.0. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?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: Id1d28924e90ed80199b61a143dac35fc6f50de68 Gerrit-Change-Number: 40417 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 09:20:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 weeks, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: Fix Dynamic test case error returning unbound...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?usp=email ) Change subject: library/MGCP_Emulation: Fix Dynamic test case error returning unbound value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?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: Id1d28924e90ed80199b61a143dac35fc6f50de68 Gerrit-Change-Number: 40417 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 09:18:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: allow passing -j/--jobs together with -b/--binary-repo

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?usp=email ) Change subject: testenv: allow passing -j/--jobs together with -b/--binary-repo ...................................................................... testenv: allow passing -j/--jobs together with -b/--binary-repo Not only the -j/--jobs is used when building the IUT components, but also when building the testsuite itself (PARALLEL_MAKE var). Change-Id: I3eb596f2c4e5de1b624c238e34785e798d2099c3 --- M _testenv/testenv/__init__.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 6118b65..9b5e944 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -87,7 +87,6 @@ group.add_argument("-i", "--io-uring", action="store_true", help="set LIBOSMO_IO_BACKEND=IO_URING") group = sub_run.add_argument_group("source/binary options", "All components are built from source by default.") - group = group.add_mutually_exclusive_group() group.add_argument( "-b", "--binary-repo", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40418?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: I3eb596f2c4e5de1b624c238e34785e798d2099c3 Gerrit-Change-Number: 40418 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Makefile: add global per-project clean target

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?usp=email ) Change subject: Makefile: add global per-project clean target ...................................................................... Makefile: add global per-project clean target Change-Id: I434ecbe3f3dd25ea770d8f2d7adfa62c67dc0c1d --- M Makefile 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index c64e130..7a9ddb8 100644 --- a/Makefile +++ b/Makefile @@ -114,6 +114,12 @@ @git clean -fx "$(1)" endef +define DIR_clean_template +.PHONY: $(1)/clean +$(1)/clean: + $(MAKE) -C $(BUILDDIR)/$(1) clean +endef + define DIR_all_template $(1): $(1)/all .PHONY: $(1)/all @@ -126,6 +132,7 @@ $(eval $(call DIR_Makefile_template,$(dir))) \ $(eval $(call DIR_compile_template,$(dir))) \ $(eval $(call DIR_clean_old_template,$(dir))) \ + $(eval $(call DIR_clean_template,$(dir))) \ $(eval $(call DIR_all_template,$(dir))) \ ) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40409?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: I434ecbe3f3dd25ea770d8f2d7adfa62c67dc0c1d Gerrit-Change-Number: 40409 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

3 weeks, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_lu_and_ussd_notify_during_mt_call

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40410?usp=email ) Change subject: msc: add TC_lu_and_ussd_notify_during_mt_call ...................................................................... msc: add TC_lu_and_ussd_notify_during_mt_call This is a more realistic scenario (race condition) that reproduces an assertion failure in osmo-msc (OS#6756). We already do have TC_mo_ussd_evil_ms reproducing the problem, but this scenario is unrealistic when using a "normal" (not "evil") MS/UE. Change-Id: I6935ad96aef7747c576505ae52f8b5d3e0611882 Related: osmo-msc.git I724f0f0c9ef8611d3c3653e9370361b252127f72 Related: OS#6756 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 64 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2f8df4d..22b6608 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3972,6 +3972,66 @@ vc_conn.done; } +friend function f_TC_lu_and_ussd_notify_during_mt_call(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var CallParameters cpars := valueof(t_CallParams); + + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + /* Initiate a MT call */ + f_mt_call_establish(cpars); + + /* Facility IE with network-originated USSD notification */ + var OCTN facility_req := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_USS_NOTIFY, + ussd_string := "Knock knock"); + /* Facility IE with acknowledgment to the USSD notification */ + var OCTN facility_rsp := enc_SS_FacilityInformation( + valueof(ts_SS_USSD_FACILITY_RETURN_RESULT_EMPTY()) + ); + + /* HLR sends a USSD notification */ + GSUP.send(ts_GSUP_PROC_SS_REQ(imsi := g_pars.imsi, + sid := g_pars.gsup_sid, + state := OSMO_GSUP_SESSION_STATE_BEGIN, + ss := facility_req)); + /* ... and immediately terminates the session */ + GSUP.send(ts_GSUP_PROC_SS_REQ(imsi := g_pars.imsi, + sid := g_pars.gsup_sid, + state := OSMO_GSUP_SESSION_STATE_END)); + + /* MSC forwards USSD notification to the MS */ + f_expect_mt_dtap_msg(tr_ML3_MT_SS_REGISTER(tid := 0, + ti_flag := c_TIF_ORIG, + facility := facility_req)); + /* ... immediately followed by the RELEASE COMPLETE message */ + f_expect_mt_dtap_msg(tr_ML3_MT_SS_RELEASE_COMPLETE(tid := 0, + ti_flag := c_TIF_ORIG, + facility := omit)); + + /* MS didn't receive the RELEASE COMPLETE yet, so it responds */ + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_SS_FACILITY(tid := 0, + ti_flag := c_TIF_REPL, + facility := facility_rsp))); + /* this response is rejected because the SS transaction is gone */ + f_expect_mt_dtap_msg(tr_ML3_MT_SS_RELEASE_COMPLETE(tid := 0, + ti_flag := c_TIF_ORIG, + facility := omit)); + + /* ... old osmo-msc crashes here (OS#6756) ... + * fixed in osmo-msc.git I724f0f0c9ef8611d3c3653e9370361b252127f72 */ + + /* Release the call (does Clear Complete itself) */ + f_call_hangup(cpars, true); +} +testcase TC_lu_and_ussd_notify_during_mt_call() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_lu_and_ussd_notify_during_mt_call), 111); + vc_conn.done; +} + /* LU followed by MO USSD request and MO Release during transaction */ friend function f_tc_lu_and_mo_ussd_mo_release(charstring id, BSC_ConnHdlrPars pars) @@ -4395,7 +4455,8 @@ /* MO (mobile-originated) SS/USSD FACILITY for an unknown transaction, * and CM SERVICE REQUEST with wrong establishment cause prior to that. - * This is an "evil MS" scenario that can be used to reproduce OS#6756. */ + * This is an "evil MS" scenario that can be used to reproduce OS#6756. + * More realistic scenario for this bug: TC_lu_and_ussd_notify_during_mt_call. */ friend function f_TC_mo_ussd_evil_ms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); @@ -7613,6 +7674,7 @@ execute( TC_proc_ss_abort() ); if (Misc_Helpers.f_osmo_repo_is("nightly")) { + execute( TC_lu_and_ussd_notify_during_mt_call() ); /* XXX: crashes osmo-msc */ execute( TC_mo_ussd_evil_ms() ); /* XXX: crashes osmo-msc */ } diff --git a/msc/expected-results.xml b/msc/expected-results.xml index dacb840..9d7e315 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -94,6 +94,7 @@ <testcase classname='MSC_Tests' name='TC_proc_ss_for_unknown_session' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_proc_ss_paging_fail' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_proc_ss_abort' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_lu_and_ussd_notify_during_mt_call' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_mo_ussd_evil_ms' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_multi_lu_and_mo_ussd' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_multi_lu_and_mt_ussd' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40410?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: I6935ad96aef7747c576505ae52f8b5d3e0611882 Gerrit-Change-Number: 40410 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

3 weeks, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: Fix Dynamic test case error returning unbound...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?usp=email ) Change subject: library/MGCP_Emulation: Fix Dynamic test case error returning unbound value ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40417?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: Id1d28924e90ed80199b61a143dac35fc6f50de68 Gerrit-Change-Number: 40417 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 07:53:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Revert "testenv: use eclipse-titan 11 in Dockerfile"

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?usp=email ) Change subject: Revert "testenv: use eclipse-titan 11 in Dockerfile" ...................................................................... Revert "testenv: use eclipse-titan 11 in Dockerfile" We had a lot of fallout from this, revert to version 9.0.0 for now. This reverts commit 8082d099e3f96da3dfe4348b0e1bd794d93b8b02. Related: OS#6490 Change-Id: I0a00fd4e031410be102cd6e99ecab4a464503003 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 9d43cbc..dca8a75 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -4,7 +4,7 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" # Copy from common dir COPY obs.key /obs.key @@ -140,9 +140,9 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes +# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-nightly.list + > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN set -x && \ apt-get update && \ @@ -150,7 +150,7 @@ eclipse-titan \ && \ apt-get clean && \ - rm /etc/apt/sources.list.d/osmocom-nightly.list + rm /etc/apt/sources.list.d/osmocom-latest.list # Add mongodb for open5gs-hss. Using the package from bullseye since bookworm # mongodb-org package is not available. Furthermore, manually install required -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?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: I0a00fd4e031410be102cd6e99ecab4a464503003 Gerrit-Change-Number: 40419 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>

3 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Revert "testenv: use eclipse-titan 11 in Dockerfile"

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?usp=email ) Change subject: Revert "testenv: use eclipse-titan 11 in Dockerfile" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?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: I0a00fd4e031410be102cd6e99ecab4a464503003 Gerrit-Change-Number: 40419 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 03 Jun 2025 06:36:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: Revert "testenv: use eclipse-titan 11 in Dockerfile"

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?usp=email ) Change subject: Revert "testenv: use eclipse-titan 11 in Dockerfile" ...................................................................... Revert "testenv: use eclipse-titan 11 in Dockerfile" We had a lot of fallout from this, revert to version 9.0.0 for now. This reverts commit 8082d099e3f96da3dfe4348b0e1bd794d93b8b02. Related: OS#6490 Change-Id: I0a00fd4e031410be102cd6e99ecab4a464503003 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/40419/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 9d43cbc..dca8a75 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -4,7 +4,7 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" # Copy from common dir COPY obs.key /obs.key @@ -140,9 +140,9 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes +# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-nightly.list + > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN set -x && \ apt-get update && \ @@ -150,7 +150,7 @@ eclipse-titan \ && \ apt-get clean && \ - rm /etc/apt/sources.list.d/osmocom-nightly.list + rm /etc/apt/sources.list.d/osmocom-latest.list # Add mongodb for open5gs-hss. Using the package from bullseye since bookworm # mongodb-org package is not available. Furthermore, manually install required -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40419?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: I0a00fd4e031410be102cd6e99ecab4a464503003 Gerrit-Change-Number: 40419 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

3 weeks, 2 days

1
0
0 0

2025

2024

2023

2022

gerrit-log