November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: BSC: reset handover related vty cfg after ho tests

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 ) Change subject: BSC: reset handover related vty cfg after ho tests ...................................................................... BSC: reset handover related vty cfg after ho tests Reset the handover related configuration to what is in osmo-bsc.cfg after running handover tests. Change-Id: I8ca6909dec633f0c1f26b5e72a7cfc1931c0ec54 --- M bsc/BSC_Tests.ttcn 1 file changed, 38 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 81a1901..98cdb45 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -883,12 +883,24 @@ } -friend function f_shutdown_helper() runs on test_CT { +friend function f_shutdown_helper(boolean ho := false) runs on test_CT { /* Run the subscr and conn leak test only when the VTY is initialized */ if (BSCVTY.checkstate("Mapped") and mp_verify_talloc_count) { f_verify_talloc_count(BSCVTY, {"struct bsc_subscr", "struct gsm_subscriber_connection"}); } + /* Reset handover related configuration */ + if (ho) { + f_bts_0_cfg(BSCVTY, + {"no neighbors", + "neighbor-list mode manual-si5", + "neighbor-list add arfcn 100", + "neighbor-list add arfcn 200", + "si5 neighbor-list add arfcn 10", + "si5 neighbor-list add arfcn 20", + "handover algorithm 1"}); + } + all component.stop; setverdict(pass); mtc.stop; @@ -5672,7 +5684,7 @@ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted"); f_ctrs_bts_add(1, "incoming_intra_bsc_ho:completed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } function f_tc_ho_int_a5(OCT1 encr_alg, charstring enc_a5 := "0 1 3") runs on test_CT { @@ -5701,7 +5713,7 @@ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:completed"); f_ctrs_bsc_and_bts_verify(); f_vty_encryption_a5_reset(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } testcase TC_ho_int_a5_0() runs on test_CT { @@ -5824,7 +5836,7 @@ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted"); f_ctrs_bts_add(1, "incoming_intra_bsc_ho:stopped"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ @@ -5958,7 +5970,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:completed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_mo_l3_transceive(RSL_DCHAN_PT rsl := RSL, @@ -6042,7 +6054,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* BSC asks for inter-BSC HO, receives BSSMAP Handover Command, but MS reports @@ -6124,7 +6136,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:failed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* BSC asks for inter-BSC-out HO, receives BSSMAP Handover Command, but then no reply is received about HO outcome @@ -6225,7 +6237,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_ho_into_this_bsc(charstring id, template (omit) BSSMAP_oldToNewBSSIEs oldToNewBSSIEs := omit) runs on MSC_ConnHdlr { @@ -6431,7 +6443,7 @@ testcase TC_ho_into_this_bsc() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); f_tc_ho_into_this_bsc_main(pars); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr, charstring vty_a5_cfg := VTY_A5_DEFAULT, @@ -6440,7 +6452,7 @@ pars.encr := encr; pars.expect_ho_fail := expect_fail; f_tc_ho_into_this_bsc_main(pars, vty_a5_cfg); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } testcase TC_ho_into_this_bsc_a5_0() runs on test_CT { @@ -6485,7 +6497,7 @@ var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; f_tc_ho_into_this_bsc_main(pars); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* Similar to TC_ho_into_this_bsc, but when in SRVCC, HO Req contains "Old BSS @@ -6502,7 +6514,7 @@ f_ctrs_bsc_and_bts_add(0, "srvcc:attempted"); f_ctrs_bsc_and_bts_add(0, "srvcc:completed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* Same as TC_srvcc_eutran_to_geran, but enables ciphering on the target channel. */ @@ -6516,7 +6528,7 @@ f_ctrs_bsc_and_bts_add(0, "srvcc:attempted"); f_ctrs_bsc_and_bts_add(0, "srvcc:completed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* Same as TC_srvcc_eutran_to_geran, but test explicitly forbiding fast return @@ -6697,7 +6709,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs on MSC_ConnHdlr { @@ -6788,7 +6800,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:stopped"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* The new BSS's lchan times out before the MSC decides that handover failed. */ @@ -6878,7 +6890,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* Same as f_tc_ho_in_fail_no_detect, but MSC fails to send a Clear Command */ @@ -6960,7 +6972,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:attempted"); f_ctrs_bsc_and_bts_add(0, "interbsc_ho_in:error"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* An incoming inter-BSC HO can either issue the Handover Request message attached to the initial SCCP N-Connect (as in @@ -6970,7 +6982,7 @@ var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr := false; f_tc_ho_into_this_bsc_main(pars); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } type record of charstring Commands; @@ -7204,7 +7216,7 @@ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_2(charstring id) runs on MSC_ConnHdlr { @@ -7257,7 +7269,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_3(charstring id) runs on MSC_ConnHdlr { @@ -7309,7 +7321,7 @@ f_ctrs_bts_add(2, "incoming_intra_bsc_ho:failed"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_4(charstring id) runs on MSC_ConnHdlr { @@ -7366,7 +7378,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_5(charstring id) runs on MSC_ConnHdlr { @@ -7409,7 +7421,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_6(charstring id) runs on MSC_ConnHdlr { @@ -7451,7 +7463,7 @@ f_ctrs_bsc_and_bts_add(0, "handover:error"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_ho_neighbor_config_7(charstring id) runs on MSC_ConnHdlr { @@ -7508,7 +7520,7 @@ f_ctrs_bsc_and_bts_add(0, "interbsc_ho_out:timeout"); f_ctrs_bsc_and_bts_verify(); - f_shutdown_helper(); + f_shutdown_helper(ho := true); } /* OS#3041: Open and close N connections in a normal fashion, and expect no @@ -10367,7 +10379,7 @@ f_sleep(1.0); vc_conn := f_start_handler(refers(f_tc_ho_during_lcs_loc_req), pars); vc_conn.done; - f_shutdown_helper(); + f_shutdown_helper(ho := true); } private function f_tc_emerg_call_and_lcs_loc_req(charstring id) runs on MSC_ConnHdlr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ca6909dec633f0c1f26b5e72a7cfc1931c0ec54 Gerrit-Change-Number: 29890 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: reset handover related vty cfg after ho tests

by osmith

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 ) Change subject: BSC: reset handover related vty cfg after ho tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8ca6909dec633f0c1f26b5e72a7cfc1931c0ec54 Gerrit-Change-Number: 29890 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Nov 2022 14:17:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: lint: enable FUNCTION_WITHOUT_ARGS

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30003 ) Change subject: lint: enable FUNCTION_WITHOUT_ARGS ...................................................................... lint: enable FUNCTION_WITHOUT_ARGS Complain if one writes func() instead of func(void). Change-Id: Ic00041025ac2584f250b5a096eae8fd0d857d9fb --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 7a60ad6..bc45f85 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -61,7 +61,6 @@ # * EMBEDDED_FUNCTION_NAME: often __func__ isn't used, arguably not much benefit in changing this when touching code # * EXECUTE_PERMISSIONS: not followed, files need to be executable: git-version-gen, some in debian/ # * FILE_PATH_CHANGES: we don't use a MAINTAINERS file -# * FUNCTION_WITHOUT_ARGS: not followed: warns about func() instead of func(void) # * GLOBAL_INITIALISERS: we initialise globals to NULL for talloc ctx (e.g. *tall_lapd_ctx = NULL) # * IF_0: used intentionally # * INITIALISED_STATIC: we use this, see also http://lkml.iu.edu/hypermail/linux/kernel/0808.1/2235.html @@ -100,7 +99,6 @@ --ignore EMBEDDED_FUNCTION_NAME \ --ignore EXECUTE_PERMISSIONS \ --ignore FILE_PATH_CHANGES \ - --ignore FUNCTION_WITHOUT_ARGS \ --ignore GLOBAL_INITIALISERS \ --ignore IF_0 \ --ignore INITIALISED_STATIC \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic00041025ac2584f250b5a096eae8fd0d857d9fb Gerrit-Change-Number: 30003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Parametrize T3-RESPONSE and N3-REQUESTS

by pespin

Attention is currently required from: pespin. pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30007 ) Change subject: ggsn: Parametrize T3-RESPONSE and N3-REQUESTS ...................................................................... ggsn: Parametrize T3-RESPONSE and N3-REQUESTS Since osmo-ggsn.git Ia15c1cfd201d7c43e9a1d6ceb6725ddf392d2c65 osmo-ggsn supports configuration of X3 timer, which should be set to (T3-RESPONSE * N3-REQUESTS) configured at the peer. The default values are 5 and 3 respectively, hence X3 is by default 5*3=15 seconds. Let's use that default value for now. Once new osmo-ggsn version is released, we can speed up test duration by decreasing the values of the module parameters introduced in this commit and configure VTY gtp timers at osmo-ggsn accordingly. Related: OS#5485 Change-Id: I02c0982674b43317a5fc8f341c03eeeb1efee77f --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/30007/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 21fdec7..6cc9732 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -77,6 +77,8 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ + integer mp_t3_response := 5; /* local T3-RESPONSE timeout, seconds */ + integer mp_n3_requests := 3; /* local N3-REQUESTS counter */ GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM; } @@ -296,13 +298,13 @@ } function f_shutdown_helper() runs on GT_CT { - /* Sleep N3_REQUESTS * T3_REQUEST seconds, nowadays 5*3=15s. + /* Sleep (T3-RESPONSE * N3-REQUESTS) seconds. * This ensures all retransmit queues are cleared before jumping * into next tests, hence avoding situation where a test resuses * a seqnum still in the GGSN's resp queue (dup req detector). * See OS#5485 avout decreasing time. We could also add a new * VTY command that calls gtp_clear_queues() */ - f_sleep(15.0); + f_sleep(int2float(mp_t3_response * mp_n3_requests)); setverdict(pass); } @@ -2090,16 +2092,15 @@ } - /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent - responses (60 seconds): If same delete req is sent and duplicate is - detected, saved duplicate response should be sent back. */ + /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent responses (T3-RESPONSE * N3-REQUESTS): + * If same delete req is sent and duplicate is detected, saved duplicate response should be sent back. */ testcase TC_act_deact_retrans_duplicate() runs on GT_CT { f_init(); var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctx); f_pdp_ctx_del(ctx, '1'B); /* leave some time in between to make sure retransmit response queue keeps packets for a while */ - f_sleep(1.0); + f_sleep(int2float(mp_t3_response)); /* g_c_seq_nr was increased during f_pdp_ctx_del(), we want a duplicate. If it was not a duplicate, osmo-ggsn would answer with a failure since that PDP ctx was already deleted. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I02c0982674b43317a5fc8f341c03eeeb1efee77f Gerrit-Change-Number: 30007 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: display JOB_TYPE infront of url

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30006 ) Change subject: jenkins-gerrit: display JOB_TYPE infront of url ...................................................................... jenkins-gerrit: display JOB_TYPE infront of url In the summary comment posted by jenkins to the patch on gerrit, display the JOB_TYPE infront of the URL instead of "build", if the build job is a matrix job that uses JOB_TYPE as variable. For such jobs, it changes: [build] https://jenkins.osmocom.org/… [build] https://jenkins.osmocom.org/… [build] https://jenkins.osmocom.org/… [build] https://jenkins.osmocom.org/… [lint] https://jenkins.osmocom.org/… to: [manuals] https://jenkins.osmocom.org/… [gateware] https://jenkins.osmocom.org/… [firmware] https://jenkins.osmocom.org/… [software] https://jenkins.osmocom.org/… [lint] https://jenkins.osmocom.org/… JOB_TYPE is used by osmo-e1-hardware and pysim. Change-Id: I51f49e4799961776dbddaedd76c14ed37a0e6c84 --- M scripts/jenkins-gerrit/pipeline_summary.py 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/30006/1 diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py index 44424d7..53c0f4a 100755 --- a/scripts/jenkins-gerrit/pipeline_summary.py +++ b/scripts/jenkins-gerrit/pipeline_summary.py @@ -10,6 +10,8 @@ jenkins_url = "https://jenkins.osmocom.org" re_start_build = re.compile("Starting building: gerrit-[a-zA-Z-_0-9]* #[0-9]*") re_result = re.compile("^PIPELINE_[A-Z]*_PASSED=[01]$") +re_job_type = re.compile("JOB_TYPE=([a-zA-Z-_0-9]*),") + def parse_args(): parser = argparse.ArgumentParser( @@ -128,10 +130,26 @@ return ret +def get_job_short_name(job): + """ :returns: a short job name, usually the stage (lint, deb, rpm, build). + Or in case of build a more useful name like the JOB_TYPE part + of the URL if it is found. For osmo-e1-hardware it could be + one of: manuals, gateware, firmware, software """ + global re_job_type + stage = job["stage"] + + if stage == "build": + match = re_job_type.search(job["url"]) + if match: + return match.group(1) + + return stage + + def get_jobs_list_str(jobs): ret = "" for job in jobs: - ret += f" [{job['stage']}] {job['url']}/consoleFull\n" + ret += f" [{get_job_short_name(job)}] {job['url']}/consoleFull\n" return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51f49e4799961776dbddaedd76c14ed37a0e6c84 Gerrit-Change-Number: 30006 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs: pysim: split into job types

by osmith

Attention is currently required from: pespin, daniel. osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30005 ) Change subject: jobs: pysim: split into job types ...................................................................... jobs: pysim: split into job types Split the test, pylint and docs job types in the matrix to run them in parallel. Depends: pysim I5245c529db729e209d78a02ab9c917a90d0e0206 Related: OS#5497 Change-Id: Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 38 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/30005/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index cc42a8e..8649635 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -338,9 +338,26 @@ - osmo-upf - pysim: - slave_axis: !!python/tuple [simtester] concurrent: false - cmd: '{timeout_cmd} ./contrib/jenkins.sh' + slave_axis: !!python/tuple [simtester,osmocom-master] + a2_name: JOB_TYPE + a2: !!python/tuple ["test", "pylint", "docs"] + combination_filter: > + (JOB_TYPE == "test" && label == "simtester") || + (JOB_TYPE == "pylint" && label == "osmocom-master") || + (JOB_TYPE == "docs" && label == "osmocom-master") + cmd: | + case "$JOB_TYPE" in + "test") + {timeout_cmd} ./contrib/jenkins.sh + ;; + *) + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + {docker_img} \ + {timeout_cmd} /build/contrib/jenkins.sh + ;; + esac pipeline_binpkgs: false - osmo-ttcn3-hacks: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index eb186bf..adf5cea 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -418,8 +418,25 @@ - pysim: concurrent: false - slave_axis: !!python/tuple [simtester] - cmd: 'PUBLISH=1 WITH_MANUALS=1 {timeout_cmd} ./contrib/jenkins.sh' + slave_axis: !!python/tuple [simtester,osmocom-master] + a2_name: JOB_TYPE + a2: !!python/tuple ["test", "pylint", "docs"] + combination_filter: > + (JOB_TYPE == "test" && label == "simtester") || + (JOB_TYPE == "pylint" && label == "osmocom-master") || + (JOB_TYPE == "docs" && label == "osmocom-master") + cmd: | + case "$JOB_TYPE" in + "test") + {timeout_cmd} ./contrib/jenkins.sh + ;; + *) + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + {docker_img} \ + {timeout_cmd} /build/contrib/jenkins.sh + ;; + esac - sysmo-usim-tool: concurrent: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4 Gerrit-Change-Number: 30005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in pysim[master]: contrib/jenkins.sh: split test/pylint/docs

by osmith

Attention is currently required from: pespin, daniel. osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/30004 ) Change subject: contrib/jenkins.sh: split test/pylint/docs ...................................................................... contrib/jenkins.sh: split test/pylint/docs Split the jenkins job up in three parts, so each of them can run in parallel, and the test part that has to run on a specific node (and blocks it while running), finishes faster. Don't install depends of pylint/docs jobs as they will run in docker and the depends get installed once in the container. Related: OS#5497 Depends: docker-playground Id5c75725d2fab46b29773fa4f637fa2d73fa7291 Depends: osmo-ci Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4 Change-Id: I5245c529db729e209d78a02ab9c917a90d0e0206 --- M contrib/jenkins.sh 1 file changed, 37 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/30004/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0ade9b4..34f47ea 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,7 @@ # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# * JOB_TYPE: one of 'test', 'pylint', 'docs' # export PYTHONUNBUFFERED=1 @@ -15,36 +16,43 @@ exit 1 fi -virtualenv -p python3 venv --system-site-packages -. venv/bin/activate -pip install -r requirements.txt +case "$JOB_TYPE" in +"test") + virtualenv -p python3 venv --system-site-packages + . venv/bin/activate -# Execute automatically discovered unit tests first -python -m unittest discover -v -s tests/ + pip install -r requirements.txt -# Run pylint to find potential errors -# Ignore E1102: not-callable -# pySim/filesystem.py: E1102: method is not callable (not-callable) -# Ignore E0401: import-error -# pySim/utils.py:276: E0401: Unable to import 'Crypto.Cipher' (import-error) -# pySim/utils.py:277: E0401: Unable to import 'Crypto.Util.strxor' (import-error) -pip install pylint -python -m pylint -j0 --errors-only \ - --disable E1102 \ - --disable E0401 \ - --enable W0301 \ - pySim *.py + # Execute automatically discovered unit tests first + python -m unittest discover -v -s tests/ -# attempt to build documentation -pip install sphinx -pip install sphinxcontrib-napoleon -pip3 install -e 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' -(cd docs && make html latexpdf) + # Run the test with physical cards + cd pysim-testdata + ../tests/pysim-test.sh + ;; +"pylint") + # Run pylint to find potential errors + # Ignore E1102: not-callable + # pySim/filesystem.py: E1102: method is not callable (not-callable) + # Ignore E0401: import-error + # pySim/utils.py:276: E0401: Unable to import 'Crypto.Cipher' (import-error) + # pySim/utils.py:277: E0401: Unable to import 'Crypto.Util.strxor' (import-error) + python3 -m pylint -j0 --errors-only \ + --disable E1102 \ + --disable E0401 \ + --enable W0301 \ + pySim *.py + ;; +"docs") + rm -rf docs/_build + make -C "docs" html latexpdf -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "docs" publish publish-html -fi - -# run the test with physical cards -cd pysim-testdata -../tests/pysim-test.sh + if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "docs" publish publish-html + fi + ;; +*) + set +x + echo "ERROR: JOB_TYPE has unexpected value '$JOB_TYPE'." + exit 1 +esac -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5245c529db729e209d78a02ab9c917a90d0e0206 Gerrit-Change-Number: 30004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: contrib/jenkins.sh: Build e1-tracer host software

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 ) Change subject: contrib/jenkins.sh: Build e1-tracer host software ...................................................................... contrib/jenkins.sh: Build e1-tracer host software Run the different job types based on a new environment variable, as the software has to be built with a different docker image. The related osmo-ci patch adjusts the jenkins jobs accordingly. Co-developed-by: Oliver Smith <osmith(a)sysmocom.de> Related: osmo-ci I90fbe72c722e491f41b9607d1a6389964d7e43b4 Change-Id: I26e839de419c6eb86bf2a6250a1adf06b761d1fa --- M contrib/jenkins.sh 1 file changed, 66 insertions(+), 53 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 79d6571..b2f49f5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,70 +2,43 @@ # jenkins build helper script for osmo-e1-hardware. This is how we build on jenkins.osmocom.org # # environment variables: -# * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") - -if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then - echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" - exit 2 -fi +# * JOB_TYPE: one of "firmware", "gateware", "manuals", "software" +# +# We assume that PATH includes the path to the respective toolchain. +# The argument '--publish' is used to trigger publication/upload of firmware. set -e TOPDIR=`pwd` publish="$1" -base="$PWD" -deps="$base/deps" -inst="$deps/install" -export deps inst - -export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" -export LD_LIBRARY_PATH="$inst/lib" -export PATH="$inst/bin:$PATH" - -osmo-clean-workspace.sh - -mkdir "$deps" || true - -# we assume that PATH includes the path to the respective toolchain - -# firmware build -FW_DIRS="firmware/ice40-riscv/e1-tracer firmware/ice40-riscv/icE1usb" -for d in $FW_DIRS; do - echo - echo "=============== $d FIRMWARE ==============" - make -C $d clean all -done - -# The argument '--publish' is used to trigger publication/upload of firmware -if [ "x$publish" = "x--publish" ]; then - - echo - echo "=============== UPLOAD FIRMWARE ==============" - - cat > "/build/known_hosts" <<EOF +cat > "/build/known_hosts" <<EOF [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF - SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ - rsync --archive --copy-links --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/latest/ - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ - rsync --verbose --copy-links --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/latest/ -fi -# manuals build + optional publication -if [ "$WITH_MANUALS" = "1" ]; then - make -C doc/manuals clean all - if [ "$PUBLISH" = "1" ]; then - make -C doc/manuals publish +case "$JOB_TYPE" in +"firmware") + FW_DIRS="firmware/ice40-riscv/e1-tracer firmware/ice40-riscv/icE1usb" + for d in $FW_DIRS; do + echo + echo "=============== $d FIRMWARE ==============" + make -C $d clean all + done + + if [ "x$publish" = "x--publish" ]; then + echo + echo "=============== UPLOAD FIRMWARE ==============" + SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ + rsync --archive --copy-links --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/latest/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ + rsync --verbose --copy-links --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/latest/ fi -fi - -# gateware build -if [ "$WITH_GATEWARE" = "1" ]; then + ;; +"gateware") GATE_VARS="IGNORE_TIMING=1 SINGLE_CHANNEL=1" GATE_DIRS="gateware/e1-tracer gateware/icE1usb" for d in $GATE_DIRS; do @@ -74,6 +47,46 @@ make -C $d clean make -C $d ${GATE_VARS} done -fi + ;; +"manuals") + make -C doc/manuals clean all -osmo-clean-workspace.sh + if [ "$PUBLISH" = "1" ]; then + make -C doc/manuals publish + fi + ;; +"software") + if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 + fi + + base="$PWD" + deps="$base/deps" + inst="$deps/install" + export deps inst + + export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" + export LD_LIBRARY_PATH="$inst/lib" + export PATH="$inst/bin:$PATH" + + osmo-clean-workspace.sh + + mkdir -p "$deps" + + osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false + osmo-build-dep.sh libosmo-abis + + SW_DIRS="software/e1-tracer/record software/e1-tracer/analyze" + for d in $SW_DIRS; do + echo + echo "=============== $d SOFTWARE ==============" + make -C $d clean all + done + + osmo-clean-workspace.sh + ;; +*) + echo "ERROR: unsupported value for JOB_TYPE: $JOB_TYPE" + exit 1 +esac -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I26e839de419c6eb86bf2a6250a1adf06b761d1fa Gerrit-Change-Number: 29921 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs: osmo-e1-hardware: split into job types

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29978 ) Change subject: jobs: osmo-e1-hardware: split into job types ...................................................................... jobs: osmo-e1-hardware: split into job types Split the job, so building the software can be done with the regular docker image instead of the fpga-build one (that doesn't have the needed dependencies). Related: osmo-e1-hardware I26e839de419c6eb86bf2a6250a1adf06b761d1fa Change-Id: I90fbe72c722e491f41b9607d1a6389964d7e43b4 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 28 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 9db1ebc..cc42a8e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -165,8 +165,20 @@ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - osmo-e1-hardware: - docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' + a2_name: JOB_TYPE + a2: !!python/tuple ["firmware", "gateware", "manuals", "software"] + cmd: | + DOCKER_IMG="{docker_img}" + case "$JOB_TYPE" in + firmware|gateware|manuals) + DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" + docker pull "$DOCKER_IMG" + ;; + esac + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + "$DOCKER_IMG" \ + {timeout_cmd} /build/contrib/jenkins.sh pipeline_binpkgs: false - osmo-ci: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 86519f7..eb186bf 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -236,8 +236,20 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo-e1-hardware: - docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' + a2_name: JOB_TYPE + a2: !!python/tuple ["firmware", "gateware", "manuals", "software"] + cmd: | + DOCKER_IMG="{docker_img}" + case "$JOB_TYPE" in + firmware|gateware|manuals) + DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" + docker pull "$DOCKER_IMG" + ;; + esac + {docker_run} \ + -e JOB_TYPE="$JOB_TYPE" \ + "$DOCKER_IMG" \ + {timeout_cmd} /build/contrib/jenkins.sh --publish - ice40-usbtrace: git_base_url: https://gitea.osmocom.org/electronics docker_img: 'registry.osmocom.org/$USER/fpga-build' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I90fbe72c722e491f41b9607d1a6389964d7e43b4 Gerrit-Change-Number: 29978 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: add timeout_cmd

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29977 ) Change subject: jobs/master-builds: add timeout_cmd ...................................................................... jobs/master-builds: add timeout_cmd Add the default timeout of 30 minutes to each job, just like in gerrit-verifications.yml. Change-Id: I2ed80258d5f2fbcd8cf27db74db125d9a52b9988 --- M jobs/master-builds.yml 1 file changed, 21 insertions(+), 20 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3371356..86519f7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -42,7 +42,8 @@ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ docker_img: '$USER/debian-buster-jenkins' - cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh' + timeout_cmd: '/usr/bin/timeout 30m' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' wrappers: [] trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org @@ -76,7 +77,7 @@ git_base_url: https://gitea.osmocom.org/sdr cmd: | {docker_run} \ - {docker_img} sh -ex -c \ + {docker_img} {timeout_cmd} sh -ex -c \ 'autoreconf -fi; \ ./configure; \ $MAKE $PARALLEL_MAKE; \ @@ -136,7 +137,7 @@ a1_name: arch a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' - cmd: '{docker_run} {docker_img} /build/contrib/jenkins_arch.sh "$arch"' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' # Full triggers would be: # trigger: > # master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp, master-openbsc, @@ -203,7 +204,7 @@ -e IU="$IU" \ -e SMPP="$SMPP" \ -e MGCP="$MGCP" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-bsc - osmo-bsc-nat @@ -232,19 +233,19 @@ {docker_run} \ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" + {docker_img} {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo-e1-hardware: docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' - ice40-usbtrace: git_base_url: https://gitea.osmocom.org/electronics docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' - no2bootloader: git_base_url: https://github.com/no2fpga docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com - osmo-fl2k: @@ -261,7 +262,7 @@ {docker_run} \ -e GTP="$GTP" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-upf @@ -274,7 +275,7 @@ node: 'osmocom-master-debian9' - osmo-gsm-tester: - cmd: '{docker_run} {docker_img} /build/contrib/jenkins-build-manuals.sh' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins-build-manuals.sh' - osmo-hlr @@ -304,7 +305,7 @@ {docker_run} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-pcap @@ -331,7 +332,7 @@ -e with_vty="$with_vty" \ -e with_dsp="$with_dsp" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -345,7 +346,7 @@ {docker_run} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-sip-connector: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org holger(a)freyther.de @@ -368,24 +369,24 @@ {docker_run} \ -e INSTR="$INSTR" \ -e WITH_MANUALS="$WITH_MANUALS" \ - {docker_img} /build/contrib/jenkins.sh + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmocom-bb - osmo-sysmon - osmo-remsim - osmo-asf4-dfu: - cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - osmo-ccid-firmware: - cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de - simtrace2: - cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-opencm3-projects: git_base_url: https://gitea.osmocom.org/electronics docker_img: '$USER/debian-bullseye-jenkins' - cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-e1d @@ -406,11 +407,11 @@ - pysim: concurrent: false slave_axis: !!python/tuple [simtester] - cmd: 'PUBLISH=1 WITH_MANUALS=1 /usr/bin/timeout 30m ./contrib/jenkins.sh' + cmd: 'PUBLISH=1 WITH_MANUALS=1 {timeout_cmd} ./contrib/jenkins.sh' - sysmo-usim-tool: concurrent: false - cmd: cd ./tests; ./run-tests + cmd: cd ./tests; {timeout_cmd} ./run-tests slave_axis: !!python/tuple [simtester] git_base_url: https://gitea.sysmocom.de/sysmocom -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2ed80258d5f2fbcd8cf27db74db125d9a52b9988 Gerrit-Change-Number: 29977 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022