- gerrit-log - lists.osmocom.org

Change in osmo-trx[master]: configure.ac: add -lboost_thread for uhd < 4.2.0
by fixeria 08 Jul '22

08 Jul '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/28537 ) Change subject: configure.ac: add -lboost_thread for uhd < 4.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/28537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0367f1c2981bf56252e7514d5993cbbec960b21b Gerrit-Change-Number: 28537 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: Fri, 08 Jul 2022 15:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: cbc: Refactor and split f_cbsp_write()
by pespin 08 Jul '22

08 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28541 ) Change subject: cbc: Refactor and split f_cbsp_write() ...................................................................... cbc: Refactor and split f_cbsp_write() Change-Id: I827fad869c6ca5ce80dd39d30c2e3393b2394217 --- M cbc/CBC_Tests.ttcn 1 file changed, 38 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/28541/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index fe59039..06fda92 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -204,8 +204,41 @@ }; type record of CBS_MessageContent CBS_MessageContents; +private function f_cbsp_tx_write_compl(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on test_CT { + var template (value) CBSP_PDU tx; + var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; + if (istemplatekind(tx_cell_list, "omit")) { + /* use the "expected list" when confirming the write-replace */ + tx_list := msg.cell_list; + } else { + /* use an user-provided different list of cells */ + tx_list := valueof(tx_cell_list); + } + if (istemplatekind(tx_compl_list, "omit")) { + tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); + } else { + tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, + valueof(tx_compl_list), tx_list, + msg.channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + +private function f_cbsp_tx_write_fail(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit) +runs on test_CT { + var template (value) CBSP_PDU tx; + tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), + omit, tx_cell_list, msg.channel_ind); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); +} + /* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ -private function f_cbsp_write(CBS_Message msg, integer idx := 0, +private function f_cbsp_handle_write(CBS_Message msg, integer idx := 0, template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, template (omit) CBSP_FailureListItems tx_fail_list := omit, template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) @@ -224,26 +257,10 @@ [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { var template (value) CBSP_PDU tx; if (istemplatekind(tx_fail_list, "omit")) { - var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; - if (istemplatekind(tx_cell_list, "omit")) { - /* use the "expected list" when confirming the write-replace */ - tx_list := msg.cell_list; - } else { - /* use an user-provided different list of cells */ - tx_list := valueof(tx_cell_list); - } - if (istemplatekind(tx_compl_list, "omit")) { - tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); - } else { - tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, - valueof(tx_compl_list), tx_list, - msg.channel_ind); - } + f_cbsp_tx_write_compl(msg, idx, tx_cell_list, tx_compl_list); } else { - tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), - omit, tx_cell_list, msg.channel_ind); + f_cbsp_tx_write_fail(msg, idx, tx_cell_list, tx_fail_list); } - CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); } [] as_cbsp_keepalive_ack(idx) { repeat; } [] CBSP[idx].receive { @@ -302,7 +319,7 @@ { '00'O, 1 } } }; - f_cbsp_write(msg); + f_cbsp_handle_write(msg); f_sleep(100.0); f_shutdown_helper(); } @@ -378,7 +395,7 @@ runs on test_CT { var EcbeCbcMessage ecbe := f_cbs2ecbe(msg, "TTCN-3"); f_ecbe_tx_post_cbs(ecbe); - f_cbsp_write(msg, 0, cell_list_success); + f_cbsp_handle_write(msg, 0, cell_list_success); f_ecbe_rx_resp(201); f_sleep(2.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28541 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: I827fad869c6ca5ce80dd39d30c2e3393b2394217 Gerrit-Change-Number: 28541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-trx[master]: configure.ac: add -lboost_thread for uhd < 4.2.0
by pespin 08 Jul '22

08 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/28537 ) Change subject: configure.ac: add -lboost_thread for uhd < 4.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/28537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0367f1c2981bf56252e7514d5993cbbec960b21b Gerrit-Change-Number: 28537 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Jul 2022 14:02:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: scripts/repo-install-test: add debian 11, drop 9
by pespin 08 Jul '22

08 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28539 ) Change subject: scripts/repo-install-test: add debian 11, drop 9 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e154def9051076bd8091b3f027ee76bbb94cb18 Gerrit-Change-Number: 28539 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Jul 2022 13:48:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: debian11-repo-install-test: add container
by pespin 08 Jul '22

08 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28540 ) Change subject: debian11-repo-install-test: add container ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7bb98b209481b25317301bdb69f48e644389745f Gerrit-Change-Number: 28540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Jul 2022 13:48:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: scripts/OBS latest: fix checkout with dir in path
by pespin 08 Jul '22

08 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28536 ) Change subject: scripts/OBS latest: fix checkout with dir in path ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1 Gerrit-Change-Number: 28536 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Jul 2022 13:48:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: scripts/repo-install-test: add debian 11, drop 9
by osmith 08 Jul '22

08 Jul '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/28539 to look at the new patch set (#2). Change subject: scripts/repo-install-test: add debian 11, drop 9 ...................................................................... scripts/repo-install-test: add debian 11, drop 9 Change-Id: I3e154def9051076bd8091b3f027ee76bbb94cb18 --- M scripts/repo-install-test.sh A scripts/repo-install-test/blacklist_debian11.txt D scripts/repo-install-test/blacklist_debian9.txt M scripts/repo-install-test/run-inside-docker.sh 4 files changed, 89 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/28539/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e154def9051076bd8091b3f027ee76bbb94cb18 Gerrit-Change-Number: 28539 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in docker-playground[master]: debian11-repo-install-test: add container
by osmith 08 Jul '22

08 Jul '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28540 ) Change subject: debian11-repo-install-test: add container ...................................................................... debian11-repo-install-test: add container Change-Id: I7bb98b209481b25317301bdb69f48e644389745f --- A debian11-repo-install-test/Dockerfile A debian11-repo-install-test/Makefile 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/28540/1 diff --git a/debian11-repo-install-test/Dockerfile b/debian11-repo-install-test/Dockerfile new file mode 100644 index 0000000..bff969f --- /dev/null +++ b/debian11-repo-install-test/Dockerfile @@ -0,0 +1,13 @@ +ARG USER +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bullseye +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# ca-certificates: needed for limesuite-images post-install script + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + aptitude \ + ca-certificates \ + gnupg \ + systemd diff --git a/debian11-repo-install-test/Makefile b/debian11-repo-install-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/debian11-repo-install-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7bb98b209481b25317301bdb69f48e644389745f Gerrit-Change-Number: 28540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ci[master]: scripts/repo-install-test: add debian 11, drop 9
by osmith 08 Jul '22

08 Jul '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28539 ) Change subject: scripts/repo-install-test: add debian 11, drop 9 ...................................................................... scripts/repo-install-test: add debian 11, drop 9 Change-Id: I3e154def9051076bd8091b3f027ee76bbb94cb18 --- M scripts/repo-install-test.sh A scripts/repo-install-test/blacklist_debian11.txt M scripts/repo-install-test/run-inside-docker.sh 3 files changed, 89 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/28539/1 diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index d13cfc8..6b14cf2 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -11,8 +11,8 @@ DISTRO="$1" DISTROS=" centos8 - debian9 debian10 + debian11 " check_usage() { diff --git a/scripts/repo-install-test/blacklist_debian11.txt b/scripts/repo-install-test/blacklist_debian11.txt new file mode 100644 index 0000000..53187dc --- /dev/null +++ b/scripts/repo-install-test/blacklist_debian11.txt @@ -0,0 +1,70 @@ +# These packages will not get explicitly installed in this test. +# Package lines must have nothing but the package (no comment, +# no additional space etc). + +# OpenBSC +# This is legacy, we aren't really interested in testing openbsc.git +# derived packages. Packages are found in openbsc/debian/control. +openbsc-dev +osmo-bsc-mgcp +osmo-bsc-mgcp-dbg +osmocom-bs11-utils +osmocom-bs11-utils-dbg +osmocom-bsc-nat +osmocom-bsc-nat-dbg +osmocom-bsc-sccplite +osmocom-bsc-sccplite-dbg +osmocom-ipaccess-utils +osmocom-ipaccess-utils-dbg +osmocom-nitb +osmocom-nitb-dbg + +# Causing conflicts, not relevant for the test +liblimesuite20.10-1-dbgsym +liborcania1.2 +liborcania1.2-dbgsym +liborcania2.1 +liborcania2.1-dbgsym +libulfius2.5 +libulfius2.5-dbgsym +libulfius2.7 +libulfius2.7-dbgsym +libyder2.0-dbgsym +limesuite-dbgsym +soapysdr0.7-module-lms7-dbgsym + +# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install +librtlsdr0-dbgsym +rtl-sdr-dbgsym + +# Depends on mongodb, which was droppend from debian 10 onwards +open5gs +open5gs-amf +open5gs-amf-dbgsym +open5gs-ausf +open5gs-ausf-dbgsym +open5gs-common +open5gs-common-dbgsym +open5gs-dbg +open5gs-hss +open5gs-hss-dbgsym +open5gs-mme +open5gs-mme-dbgsym +open5gs-nrf +open5gs-nrf-dbgsym +open5gs-pcf +open5gs-pcf-dbgsym +open5gs-pcrf +open5gs-pcrf-dbgsym +open5gs-sgwc +open5gs-sgwc-dbgsym +open5gs-sgwu +open5gs-sgwu-dbgsym +open5gs-smf +open5gs-smf-dbgsym +open5gs-udm +open5gs-udm-dbgsym +open5gs-udr +open5gs-udr-dbgsym +open5gs-upf +open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index 933adef..fec344e 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -39,12 +39,12 @@ centos8) echo "CentOS_8" ;; - debian9) - echo "Debian_9.0" - ;; debian10) echo "Debian_10" ;; + debian11) + echo "Debian_11" + ;; *) echo "ERROR: unknown obsdir for '$DISTRO'." >&2 exit 1 @@ -219,9 +219,21 @@ find_patterns_or_exit \ /tmp/out \ "requested an impossible situation" \ - "^The following packages have unmet dependencies:" \ - "Depends: osmocom-" \ - "but it is not going to be installed" + "^The following packages have unmet dependencies:" + + case "$DISTRO" in + debian10) + find_patterns_or_exit \ + /tmp/out \ + "Depends: osmocom-" \ + "but it is not going to be installed" + ;; + debian11) + find_patterns_or_exit \ + /tmp/out \ + "Conflicts: osmocom-" + ;; + esac configure_osmocom_repo_debian_remove "$PROJ_CONFLICT" configure_osmocom_repo_debian "$PROJ" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e154def9051076bd8091b3f027ee76bbb94cb18 Gerrit-Change-Number: 28539 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ci[master]: scripts/OBS latest: fix checkout with dir in path
by osmith 08 Jul '22

08 Jul '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28536 ) Change subject: scripts/OBS latest: fix checkout with dir in path ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/28536/comment/e224a00c_228aa763 PS1, Line 18: "osmo-python-test" directory like in nightly. Make it behave the same by > you are either missing an s in "tests" here, or need to remove it above. Done File scripts/osmocom-latest-packages.sh: https://gerrit.osmocom.org/c/osmo-ci/+/28536/comment/c7ca73be_fbbdf981 PS1, Line 55: project="$(basename $path)" > are you sure this applies to all projects? yes. basename strips directories from paths, if there is none present then it returns the same string. $ basename python/foo foo $ basename foo foo -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1 Gerrit-Change-Number: 28536 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Jul 2022 12:46:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log