[M] Change in libosmo-netif[master]: stream: Add and use IPA send function
Attention is currently required from: arehbein, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use IPA send function .. Patch Set 20: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 20 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 06 Oct 2023 05:35:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email 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: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36 Gerrit-Change-Number: 34673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 06 Oct 2023 05:34:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate generating g_AllChannels[] into a function
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email ) Change subject: BTS_Tests: separate generating g_AllChannels[] into a function .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email 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: Iab2d009b977255b16028c77a9b96df48d270ed1c Gerrit-Change-Number: 34672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 06 Oct 2023 05:33:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate generating g_AllChannels[] into a function
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email )
Change subject: BTS_Tests: separate generating g_AllChannels[] into a function
..
BTS_Tests: separate generating g_AllChannels[] into a function
Change-Id: Iab2d009b977255b16028c77a9b96df48d270ed1c
Related: SYS#5313, OS#5956
---
M bts/BTS_Tests.ttcn
1 file changed, 50 insertions(+), 35 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/72/34672/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index df18403..6e4a36a 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -515,6 +515,44 @@
trxc_conn_id := res.connId;
}
+private function f_gen_chans_for_ts(uint3_t tn, PchanConfig config)
+return ChannelNrs
+{
+ select (config) {
+ case (GSM_PCHAN_CCCH_SDCCH4) {
+ return { valueof(ts_RslChanNr_SDCCH4(tn, 0)),
+valueof(ts_RslChanNr_SDCCH4(tn, 1)),
+valueof(ts_RslChanNr_SDCCH4(tn, 2)),
+valueof(ts_RslChanNr_SDCCH4(tn, 3)) };
+ }
+ case (GSM_PCHAN_SDCCH8) {
+ return { valueof(ts_RslChanNr_SDCCH8(tn, 0)),
+valueof(ts_RslChanNr_SDCCH8(tn, 1)),
+valueof(ts_RslChanNr_SDCCH8(tn, 2)),
+valueof(ts_RslChanNr_SDCCH8(tn, 3)),
+valueof(ts_RslChanNr_SDCCH8(tn, 4)),
+valueof(ts_RslChanNr_SDCCH8(tn, 5)),
+valueof(ts_RslChanNr_SDCCH8(tn, 6)),
+valueof(ts_RslChanNr_SDCCH8(tn, 7)) };
+ }
+ case (GSM_PCHAN_TCHH_TCHF_PDCH) {
+ return { valueof(ts_RslChanNr_Lm(tn, 0)),
+valueof(ts_RslChanNr_Lm(tn, 1)),
+valueof(ts_RslChanNr_Bm(tn)) };
+ }
+ case (GSM_PCHAN_TCHH) {
+ return { valueof(ts_RslChanNr_Lm(tn, 0)),
+valueof(ts_RslChanNr_Lm(tn, 1)) };
+ }
+ case (GSM_PCHAN_TCHF,
+ GSM_PCHAN_TCHF_PDCH) {
+ return { valueof(ts_RslChanNr_Bm(tn)) };
+ }
+ }
+
+ return { };
+}
+
/* global init function (without PCUIF connection) */
friend function f_init(uint8_t trx_nr := 0)
runs on test_CT
@@ -550,41 +588,8 @@
/* Generate list of all logical channels from module parameters */
for (var integer tn := 0; tn < lengthof(trx_pars.ts); tn := tn + 1) {
- select (trx_pars.ts[tn].config) {
- case (GSM_PCHAN_CCCH_SDCCH4) {
- g_AllChannels := g_AllChannels &
- { valueof(ts_RslChanNr_SDCCH4(tn, 0)),
- valueof(ts_RslChanNr_SDCCH4(tn, 1)),
- valueof(ts_RslChanNr_SDCCH4(tn, 2)),
- valueof(ts_RslChanNr_SDCCH4(tn, 3)) };
- }
- case (GSM_PCHAN_SDCCH8) {
- g_AllChannels := g_AllChannels &
- { valueof(ts_RslChanNr_SDCCH8(tn, 0)),
- valueof(ts_RslChanNr_SDCCH8(tn, 1)),
- valueof(ts_RslChanNr_SDCCH8(tn, 2)),
- valueof(ts_RslChanNr_SDCCH8(tn, 3)),
- valueof(ts_RslChanNr_SDCCH8(tn, 4)),
- valueof(ts_RslChanNr_SDCCH8(tn, 5)),
- valueof(ts_RslChanNr_SDCCH8(tn, 6)),
- valueof(ts_RslChanNr_SDCCH8(tn, 7)) };
- }
- case (GSM_PCHAN_TCHH_TCHF_PDCH) {
- g_AllChannels := g_AllChannels &
- { valueof(ts_RslChanNr_Lm(tn, 0)),
- valueof(ts_RslChanNr_Lm(tn, 1)),
- valueof(ts_RslChanNr_Bm(tn)) };
- }
- case (GSM_PCHAN_TCHH) {
- g_AllChannels := g_AllChannels &
- { valueof(ts_RslChanNr_Lm(tn, 0)),
- valueof(ts_RslChanNr_Lm(tn, 1)) };
- }
- case (GSM_PCHAN_TCHF, GSM_PCHAN_TCHF_PDCH) {
- g_AllChannels := g_AllChannels &
- { valueof(ts_RslChanNr_Bm(tn)) };
- }
- }
+ var PchanConfig config := trx_pars.ts[tn].config;
+ g_AllChannels := g_AllChannels & f_gen_chans_for_ts(tn, config);
}
f_init_rsl(id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34672?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email )
Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
..
BTS_Tests: fix TC_rsl_rf_resource_ind: handle dynTS and PDCH
Change-Id: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36
Related: osmo-bts.git I56f83db5264c246ec1b4b8a973105a4fc09931fb
Related: SYS#5313, OS#5956
---
M bts/BTS_Tests.ttcn
1 file changed, 35 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/73/34673/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 6e4a36a..db66b0c 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -7758,22 +7758,38 @@
}
}
testcase TC_rsl_rf_resource_ind() runs on test_CT {
+ var TrxParsItem trx_pars := mp_trx_pars[0];
var RSL_ResourceInfo info := { };
+ var ChannelNrs chans := { };
f_init(trx_nr := 0);
f_init_l1ctl();
f_l1_tune(L1CTL);
- /* g_AllChannels contains all logical channels */
- for (var integer i := 0; i < lengthof(g_AllChannels); i := i + 1) {
- var RslChannelNr chan_nr := g_AllChannels[i];
+ /* Generate a list of logical channels from module parameters */
+ for (var integer tn := 0; tn < lengthof(trx_pars.ts); tn := tn + 1) {
+ var PchanConfig config := trx_pars.ts[tn].config;
+ select (config) {
+ case (GSM_PCHAN_TCHH_TCHF_PDCH) {
+ /* dyn/osmocom: set to NONE by default */
+ }
+ case (GSM_PCHAN_TCHF_PDCH) {
+ /* dyn/ipaccess: set to TCH/F by default */
+ chans := chans & { valueof(ts_RslChanNr_Bm(tn)) };
+ }
+ case (GSM_PCHAN_PDCH) {
+ chans := chans & { valueof(ts_RslChanNr_PDCH(tn)) };
+ }
+ case else {
+ chans := chans & f_gen_chans_for_ts(tn, config);
+ }
+ }
+ }
- /* FIXME: osmo-bts does not report for Osmocom style dynamic
timeslots */
- if (mp_trx_pars[0].ts[chan_nr.tn].config ==
GSM_PCHAN_TCHH_TCHF_PDCH)
- { continue; }
-
- info := info & { valueof(ts_RSL_ResourceInfoItem(chan_nr,
mp_interf_band)) };
+ /* Generate a list of RSL ResourceInfo items */
+ for (var integer i := 0; i < lengthof(chans); i := i + 1) {
+ info := info & { valueof(ts_RSL_ResourceInfoItem(chans[i],
mp_interf_band)) };
}
/* Align to the first interference report */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34673?usp=email
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: I2d13fd3f0fd15d1762bf6f2f61de85cbe990ec36
Gerrit-Change-Number: 34673
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email ) Change subject: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image .. Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image Change-Id: I8d9bd77bbfac14a9951a549a21ee6bc4ea7b267a --- M jenkins-common.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index 72eaec2..e72a28d 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -21,6 +21,7 @@ osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; + osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; ttcn3-*) echo "debian-bookworm-titan" ;; -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8d9bd77bbfac14a9951a549a21ee6bc4ea7b267a Gerrit-Change-Number: 34652 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email ) Change subject: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8d9bd77bbfac14a9951a549a21ee6bc4ea7b267a Gerrit-Change-Number: 34652 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 20:27:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 20:27:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/master: use same url scheme as gerrit jobs
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email ) Change subject: jobs/master: use same url scheme as gerrit jobs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe992dd8027a8b8df8623abc57a590972443449f Gerrit-Change-Number: 34660 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 20:27:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: Fix indices of ARFCNs for measurement report
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email ) Change subject: Fix indices of ARFCNs for measurement report .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069 Gerrit-Change-Number: 34658 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 05 Oct 2023 20:18:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
Attention is currently required from: arehbein, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email ) Change subject: stream (test): Fix Coverity CID 323456 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac Gerrit-Change-Number: 34671 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 20:17:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
Attention is currently required from: arehbein, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email )
Change subject: stream (test): Fix Coverity CID 323456
..
Patch Set 1: Code-Review+1
(1 comment)
File tests/stream/stream_test.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34671/comment/dbb35252_c6b64a1f
PS1, Line 681: if (5 < ipa_msg_type) {
> feel free to change it if you want, it shouldn't have been in the other way
> before anyway imho.
ack
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
Gerrit-Change-Number: 34671
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 05 Oct 2023 18:37:02 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: Fix indices of ARFCNs for measurement report
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email ) Change subject: Fix indices of ARFCNs for measurement report .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069 Gerrit-Change-Number: 34658 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 05 Oct 2023 18:35:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix selection of correct ARFCN at arfcn_from_freq_index()
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email ) Change subject: Fix selection of correct ARFCN at arfcn_from_freq_index() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7 Gerrit-Change-Number: 34657 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 05 Oct 2023 18:32:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email ) Change subject: Fix osmo_dia2gsup-master not pulling in debian-bookworm-erlang dep image .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8d9bd77bbfac14a9951a549a21ee6bc4ea7b267a Gerrit-Change-Number: 34652 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 17:22:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
Attention is currently required from: arehbein.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email )
Change subject: stream (test): Fix Coverity CID 323456
..
Patch Set 1:
(1 comment)
File tests/stream/stream_test.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34671/comment/dca0e02b_b5fdde32
PS1, Line 681: if (5 < ipa_msg_type) {
> I thought about it, but then I also thought somebody else might complain that
> leaving it the way it […]
feel free to change it if you want, it shouldn't have been in the other way
before anyway imho.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
Gerrit-Change-Number: 34671
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Comment-Date: Thu, 05 Oct 2023 17:09:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make RLC timing data configurable
Attention is currently required from: arehbein.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Make RLC timing data configurable
..
Patch Set 2:
(1 comment)
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/5a1a2b04_521c0d30
PS2, Line 51: { .T = 3142, .default_val = 20,
> I don't have a GSM background, let alone ever configured/tuned any GSM
> network settings. […]
I am (and others) available for questions if you are unsure where to put stuff
:)
If you are uncertain, then better raising the topic before writing tons of
lines next time may be good.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Comment-Date: Thu, 05 Oct 2023 17:09:00 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
Attention is currently required from: pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email )
Change subject: stream (test): Fix Coverity CID 323456
..
Patch Set 1:
(1 comment)
File tests/stream/stream_test.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34671/comment/67f9a54b_46126c34
PS1, Line 681: if (5 < ipa_msg_type) {
> this syntax for comparision is a bit weird imho. I'd say we usually have the
> vars on the left side. […]
I thought about it, but then I also thought somebody else might complain that
leaving it the way it is would make reading the diff more easy, so I left it
the way it was.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
Gerrit-Change-Number: 34671
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 05 Oct 2023 17:04:52 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make RLC timing data configurable
Attention is currently required from: pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Make RLC timing data configurable
..
Patch Set 2:
(1 comment)
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/aa4fc799_e07c215a
PS2, Line 51: { .T = 3142, .default_val = 20,
> > So, how do I know which timers are BTS-specific or depend on BTS support?
> > […]
I don't have a GSM background, let alone ever configured/tuned any GSM network
settings. These timers touch different kinds of procedures described across
different specs, too, I would guess.
So while it may or may not be easy to do so once I've acquired the right
knowledge to make these decisions, it will probably be quite time consuming for
me to read up on all of that.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 05 Oct 2023 17:02:33 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
Attention is currently required from: arehbein.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email )
Change subject: stream (test): Fix Coverity CID 323456
..
Patch Set 1: Code-Review+1
(1 comment)
File tests/stream/stream_test.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34671/comment/a4d7729e_1e75ea35
PS1, Line 681: if (5 < ipa_msg_type) {
this syntax for comparision is a bit weird imho. I'd say we usually have the
vars on the left side.
That's basically: "if (ipa_msg_type > 5)" right?
not criticial though.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
Gerrit-Change-Number: 34671
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Comment-Date: Thu, 05 Oct 2023 16:54:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make RLC timing data configurable
Attention is currently required from: arehbein.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Make RLC timing data configurable
..
Patch Set 2:
(2 comments)
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/0b3ff55e_64a5f16d
PS2, Line 51: { .T = 3142, .default_val = 20,
> So, how do I know which timers are BTS-specific or depend on BTS support?
Easy procedure: Would it make sense for a user/operator to set different values
per BTS? Answer: yes! => per bts.
Wuthout looking in detail, some of thse values clearly could be tunned
different on different BTS, with different operation constrains, different
volume of users, different load, etc.
I think to have one group named "bts" should be enough, even if some bts don't
support setting some of the params.
File tests/nanobts_omlattr/nanobts_omlattr_test.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/4931c325_0debbf22
PS2, Line 228: 0x02, 0x00, 0x02, 0xa3, 0x00, 0x09,
> No default values have been changed. […]
ah ok. Can you at least take the chance to align them to the same column?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Comment-Date: Thu, 05 Oct 2023 16:51:20 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
arehbein has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email )
Change subject: stream (test): Fix Coverity CID 323456
..
stream (test): Fix Coverity CID 323456
Fix Coverity CID 323456 ("Control flow issues (NO_EFFECT)") by removing
'greater than 0'-check on unsigned integer-type variable.
Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
---
M tests/stream/stream_test.c
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/71/34671/1
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index e945a1e..960d8fa 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -678,7 +678,7 @@
}
LOGSRV(conn, "Received message from stream (total len including
stripped headers = %lu)\n",
osmo_ntohs(h->len) + sizeof(*h));
- if (ipa_msg_type < 0 || 5 < ipa_msg_type) {
+ if (5 < ipa_msg_type) {
fprintf(stderr, "Received unexpected IPAC message type
%"PRIu8"\n", ipa_msg_type);
return -ENOMSG;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac
Gerrit-Change-Number: 34671
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-MessageType: newchange
[M] Change in osmo-bsc[master]: Make RLC timing data configurable
Attention is currently required from: pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Make RLC timing data configurable
..
Patch Set 2:
(4 comments)
File include/osmocom/bsc/gsm_data.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/2a852ad1_4b2065fe
PS2, Line 50: #define GSM_N3101_STRICT_LOWER_BOUND 8UL
> STRICT_LOWER_BOUND means simply "MIN" ? :D
Well, no,
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/80fbf532_679c8459
PS2, Line 50: #define GSM_N3101_STRICT_LOWER_BOUND 8UL
> STRICT_LOWER_BOUND means simply "MIN" ? :D
The spec states that 'N3101 > 8', so it isn't a minimum (it's not an allowed
value).
I put the strict lower bound and not the minimum as a define, because that's
how it's stated in the spec.
File src/osmo-bsc/net_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/d1a74a6b_efb0cb0c
PS2, Line 51: { .T = 3142, .default_val = 20,
> I know tons of parameters are already added here, but we should not continue
> adding BTS-specific par […]
So, how do I know which timers are BTS-specific or depend on BTS support?
I first thought the groupings suggested on
https://www.rfwireless-world.com/Terminology/GSM-timers.html (GSM Timers, GSM
Timers Network Side(BTS), ...) might make sense, but T3142 isn't listed there
as a BTS timer, it's listed as a timer for the mobile side (MSC I guess).
I was thinking about adding a group named "bts". Or am I supposed to add
several groups for different kinds of BTSs/
File tests/nanobts_omlattr/nanobts_omlattr_test.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/623669e9_742473c6
PS2, Line 228: 0x02, 0x00, 0x02, 0xa3, 0x00, 0x09,
> why is this changing? are you changing the default values?
No default values have been changed. I just added changed the paragraph
formatting a bit and added a comment line so that if anyone else reads the code
in the future, it's possible to read which octet contains which information
without having to go through the entire code.
It shouldn't be necessary for anybody to lose time over looking up this
information again, at least not for that line.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 2
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 05 Oct 2023 16:35:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: gitreview: new file
osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file .. gitreview: new file Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f --- A .gitreview 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f73c47a --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=erlang/osmo-epdg -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: gitreview: new file
Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-MessageType: deleteVote
[S] Change in ...osmo-epdg[master]: gitreview: new file
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 16:20:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry .. debian/changelog: add initial entry This is required for building a debian package. Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8b13789..a551727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1 +1,6 @@ +osmo-epdg (0.0.0) unstable; urgency=medium + + Initial + + -- Oliver Smith Thu, 28 Sep 2023 13:53:07 +0200 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email )
Change subject: obs: srcpkg: support having no git tags
..
obs: srcpkg: support having no git tags
Instead of failing when a project has no git-version-gen script, and no
git tags, use 0.0.0 as version. This is needed for the new osmo-epdg
project, which doesn't have tags yet.
Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4
---
M scripts/obs/lib/srcpkg.py
1 file changed, 28 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 324bc66..9476d82 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -42,11 +42,24 @@
pattern = lib.git.get_latest_tag_pattern(project)
pattern = pattern.replace("^", "", 1)
pattern = pattern.replace("$", "", -1)
-ret = lib.run_cmd(["git", "describe",
+result = lib.run_cmd(["git", "describe",
"--abbrev=4",
"--tags",
f"--match={pattern}",
- "HEAD"], cwd=repo_path).output.rstrip()
+ "HEAD"], cwd=repo_path, check=False)
+
+if result.returncode == 128:
+print(f"{project}: has no git tags, using 0.0.0 as version")
+commit = lib.run_cmd(["git", "rev-parse", "HEAD"],
+ cwd=repo_path).output[0:4]
+count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"],
+ cwd=repo_path).output.rstrip()
+return f"0.0.0.{count}-{commit}"
+
+if result.returncode != 0:
+lib.exit_error_cmd(result, "command failed unexpectedly")
+
+ret = result.output.rstrip()
# Like git-version-gen:
# * Change the first '-' to '.'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4
Gerrit-Change-Number: 34669
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email ) Change subject: obs: srcpkg: support having no git tags .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 Gerrit-Change-Number: 34669 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 16:16:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 16:16:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry .. debian/changelog: add initial entry This is required for building a debian package. Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/70/34670/1 diff --git a/debian/changelog b/debian/changelog index 8b13789..a551727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1 +1,6 @@ +osmo-epdg (0.0.0) unstable; urgency=medium + + Initial + + -- Oliver Smith Thu, 28 Sep 2023 13:53:07 +0200 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email )
Change subject: obs: srcpkg: support having no git tags
..
obs: srcpkg: support having no git tags
Instead of failing when a project has no git-version-gen script, and no
git tags, use 0.0.0 as version. This is needed for the new osmo-epdg
project, which doesn't have tags yet.
Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4
---
M scripts/obs/lib/srcpkg.py
1 file changed, 28 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/34669/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 324bc66..9476d82 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -42,11 +42,24 @@
pattern = lib.git.get_latest_tag_pattern(project)
pattern = pattern.replace("^", "", 1)
pattern = pattern.replace("$", "", -1)
-ret = lib.run_cmd(["git", "describe",
+result = lib.run_cmd(["git", "describe",
"--abbrev=4",
"--tags",
f"--match={pattern}",
- "HEAD"], cwd=repo_path).output.rstrip()
+ "HEAD"], cwd=repo_path, check=False)
+
+if result.returncode == 128:
+print(f"{project}: has no git tags, using 0.0.0 as version")
+commit = lib.run_cmd(["git", "rev-parse", "HEAD"],
+ cwd=repo_path).output[0:4]
+count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"],
+ cwd=repo_path).output.rstrip()
+return f"0.0.0.{count}-{commit}"
+
+if result.returncode != 0:
+lib.exit_error_cmd(result, "command failed unexpectedly")
+
+ret = result.output.rstrip()
# Like git-version-gen:
# * Change the first '-' to '.'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4
Gerrit-Change-Number: 34669
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
..
rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
The previous logic was wrongly written. We want:
* If PKT UL ASS didn't have a tbf_starting_time but had an S/P+RRBP,
it means we have to delay completing the FSM until we send the PKT CTRL ACK
(next_blk)
* If it contained tbf_starting_time, if it happens before next_blk, still wait
until next_blk
Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved; Verified
Jenkins Builder: Verified
diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c
index 1783d5b..1c67213 100644
--- a/src/rlcmac/tbf_ul_ass_fsm.c
+++ b/src/rlcmac/tbf_ul_ass_fsm.c
@@ -413,7 +413,7 @@
/* We need to wait at least until sending the PKT CTRL
* ACK (in the old CTRL TS) before completing the
* assignment and using the new TS assignment. */
- if (!ctx->tbf_starting_time_exists &&
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
+ if (!ctx->tbf_starting_time_exists ||
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
ctx->tbf_starting_time_exists = true;
ctx->tbf_starting_time = next_blk;
}
@@ -474,7 +474,7 @@
/* We need to wait at least until sending the PKT CTRL
* ACK (in the old CTRL TS) before completing the
* assignment and using the new TS assignment. */
- if (!ctx->tbf_starting_time_exists &&
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
+ if (!ctx->tbf_starting_time_exists ||
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
ctx->tbf_starting_time_exists = true;
ctx->tbf_starting_time = next_blk;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43
Gerrit-Change-Number: 34667
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email ) Change subject: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time .. Patch Set 2: Verified+1 Code-Review+2 (1 comment) Patchset: PS2: Tested, confirmed to fix various issues. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43 Gerrit-Change-Number: 34667 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:58:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Add debian build support
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support .. Add debian build support Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f --- A contrib/generate_build_dep.sh A contrib/osmo-epdg.service A contrib/systemd/osmo-epdg.service A debian/changelog A debian/compat A debian/control A debian/osmo-epdg.install A debian/rules 8 files changed, 98 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 000..409c2f5 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory of the osmo-epdg directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete +tar czf build_dep.tar.gz ./_checkouts diff --git a/contrib/osmo-epdg.service b/contrib/osmo-epdg.service new file mode 100644 index 000..bfa8293 --- /dev/null +++ b/contrib/osmo-epdg.service @@ -0,0 +1,15 @@ +[Unit] +Description=Osmocom ePDG (Evolved Packet Data Gateway) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-epdg.service b/contrib/systemd/osmo-epdg.service new file mode 100644 index 000..a62a972 --- /dev/null +++ b/contrib/systemd/osmo-epdg.service @@ -0,0 +1,16 @@ +[Unit] +Description=Osmocom DIAMETER to GSUP translator +After=osmo-hlr.service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..8b13789 --- /dev/null +++ b/debian/changelog @@ -0,0 +1 @@ + diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 000..c484b29 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: osmo-epdg +Maintainer: Osmocom team +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, + debhelper (>= 10) +Standards-Version: 4.5.0 + +Package: osmo-epdg +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom ePDG (Evolved Packet Data Gateway) + diff --git a/debian/osmo-epdg.install b/debian/osmo-epdg.install new file mode 100644 index 000..0840d06 --- /dev/null +++ b/debian/osmo-epdg.install @@ -0,0 +1,2 @@ +/contrib/systemd/osmo-epdg.service /lib/systemd/system/ +/_build/default/bin/osmo-epdg /usr/bin/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 000..89863f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi + rebar3 compile + rebar3 escriptize + rebar3 eunit + +override_dh_clean: + dh_clean + rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
pespin has submitted this change. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email )
Change subject: Initial work to have proper app compilation and escript
generation
..
Initial work to have proper app compilation and escript generation
Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964
---
A Makefile
M rebar.config
A rebar.lock
R src/osmo_epdg.app.src
A src/osmo_epdg.erl
R src/osmo_epdg_app.erl
R src/osmo_epdg_sup.erl
7 files changed, 67 insertions(+), 6 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..43e749d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+all: build
+
+build:
+ rebar3 compile
+ rebar3 escriptize
+
+run: build
+ _build/default/bin/osmo-epdg
+
+check:
+ rebar3 eunit
+
+clean:
+ rm -rf _build/
diff --git a/rebar.config b/rebar.config
index d0176c4..51852e4 100644
--- a/rebar.config
+++ b/rebar.config
@@ -36,7 +36,7 @@
{escript_name, "osmo-epdg"}.
{relx,
- [{release, {"osmo-epdg", "1.0.0"}, [epdg]},
+ [{release, {"osmo-epdg", "1.0.0"}, [osmo_epdg]},
{sys_config, "./config/sys.config"},
{vm_args, "./config/vm.args"},
{dev_mode, true},
diff --git a/rebar.lock b/rebar.lock
new file mode 100644
index 000..4c53cab
--- /dev/null
+++ b/rebar.lock
@@ -0,0 +1,32 @@
+{"1.2.0",
+[{<<"epcap">>,
+ {git,"https://github.com/msantos/epcap;,
+ {ref,"d5c03caf608c1369e68cfed0a606d3eb82ddfd21"}},
+ 1},
+ {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
+ {<<"lager">>,
+ {git,"https://github.com/erlang-lager/lager;,
+ {ref,"459a3b2cdd9eadd29e5a7ce5c43932f5ccd6eb88"}},
+ 0},
+ {<<"osmo_gsup">>,
+ {git,"https://gitea.osmocom.org/erlang/osmo_gsup;,
+ {ref,"ee15ee2b44f4a57c57831393d1fed2dc215d36e4"}},
+ 0},
+ {<<"osmo_ss7">>,
+ {git,"https://gitea.osmocom.org/erlang/osmo_ss7;,
+ {ref,"3c6cdc5a53c4a5ec1aff417f2cbfaa9449004ee6"}},
+ 0},
+ {<<"parse_trans">>,
+ {git,"https://github.com/uwiger/parse_trans;,
+ {ref,"cdb01ba260ba9a00b2aafa17affead0f6fac081c"}},
+ 1},
+ {<<"pkt">>,
+ {git,"https://github.com/msantos/pkt;,
+ {ref,"67a4a14f596fded5ad5f2d8f94318faa8ad2c288"}},
+ 1}]}.
+[
+{pkg_hash,[
+ {<<"goldrush">>,
<<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}]},
+{pkg_hash_ext,[
+ {<<"goldrush">>,
<<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>}]}
+].
diff --git a/src/epdg.app.src b/src/osmo_epdg.app.src
similarity index 89%
rename from src/epdg.app.src
rename to src/osmo_epdg.app.src
index 4a11ef8..b75cf4d 100644
--- a/src/epdg.app.src
+++ b/src/osmo_epdg.app.src
@@ -1,5 +1,5 @@
%-*- mode: erlang -*-
-{application, epdg,
+{application, osmo_epdg,
[
{description, "ePDG"},
{vsn, "1"},
diff --git a/src/osmo_epdg.erl b/src/osmo_epdg.erl
new file mode 100644
index 000..41ce704
--- /dev/null
+++ b/src/osmo_epdg.erl
@@ -0,0 +1,7 @@
+-module(osmo_epdg).
+
+-export([main/1]).
+
+main(_Args) ->
+ application:ensure_all_started(?MODULE),
+ timer:sleep(infinity).
diff --git a/src/epdg_app.erl b/src/osmo_epdg_app.erl
similarity index 67%
rename from src/epdg_app.erl
rename to src/osmo_epdg_app.erl
index 8bf2279..197fb97 100644
--- a/src/epdg_app.erl
+++ b/src/osmo_epdg_app.erl
@@ -1,12 +1,11 @@
--module(epdg_app).
-
+-module(osmo_epdg_app).
-behaviour(application).
-export([start/2, stop/1]).
start(_StartType, _StartArgs) ->
- epdg_sup:start_link().
+ osmo_epdg_sup:start_link().
stop(_State) ->
ok.
diff --git a/src/epdg_sup.erl b/src/osmo_epdg_sup.erl
similarity index 94%
rename from src/epdg_sup.erl
rename to src/osmo_epdg_sup.erl
index 836fa9c..231d27f 100644
--- a/src/epdg_sup.erl
+++ b/src/osmo_epdg_sup.erl
@@ -1,4 +1,4 @@
--module(epdg_sup).
+-module(osmo_epdg_sup).
-behaviour(supervisor).
-export([start_link/0]).
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964
Gerrit-Change-Number: 34654
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: Add .gitignore
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore .. Add .gitignore Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 --- A .gitignore 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..08ae348 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +_build/ +include/ +log/ + +*.beam +erl_crash.dump + +src/diameter_3gpp* +src/diameter_rfc* +src/diameter_etsi* -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Add contrib/jenkins.sh Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 --- A contrib/jenkins.sh 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Verified osmith: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 000..87eae34 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 escriptize +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in ...osmo-epdg[master]: Add debian build support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Add debian build support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Add debian build support
Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: deleteVote
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: deleteVote
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: deleteVote
[S] Change in ...osmo-epdg[master]: Add .gitignore
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 15:55:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation .. Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: Let's just merge it as it for now to get everything in a proper state, we can fix whatever later. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 15:54:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: Add .gitignore
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 15:54:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: gitreview: new file
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:54:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: gitreview: new file
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file .. gitreview: new file Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f --- A .gitreview 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/68/34668/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..f73c47a --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=erlang/osmo-epdg -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in libosmo-gprs[master]: WIP
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34666?usp=email ) Change subject: WIP .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iaa1813655b334781032b6d5caf711545d3613e2c Gerrit-Change-Number: 34666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: abandon
[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
..
rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
The previous logic was wrongly written. We want:
* If PKT UL ASS didn't have a tbf_starting_time but had an S/P+RRBP,
it means we have to delay completing the FSM until we send the PKT CTRL ACK
(next_blk)
* If it contained tbf_starting_time, if it happens before next_blk, still wait
until next_blk
Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/67/34667/1
diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c
index 2260596..9433e61 100644
--- a/src/rlcmac/tbf_ul_ass_fsm.c
+++ b/src/rlcmac/tbf_ul_ass_fsm.c
@@ -415,7 +415,7 @@
/* We need to wait at least until sending the PKT CTRL
* ACK (in the old CTRL TS) before completing the
* assignment and using the new TS assignment. */
- if (!ctx->tbf_starting_time_exists &&
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
+ if (!ctx->tbf_starting_time_exists ||
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
ctx->tbf_starting_time_exists = true;
ctx->tbf_starting_time = next_blk;
}
@@ -476,7 +476,7 @@
/* We need to wait at least until sending the PKT CTRL
* ACK (in the old CTRL TS) before completing the
* assignment and using the new TS assignment. */
- if (!ctx->tbf_starting_time_exists &&
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
+ if (!ctx->tbf_starting_time_exists ||
gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) {
ctx->tbf_starting_time_exists = true;
ctx->tbf_starting_time = next_blk;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43
Gerrit-Change-Number: 34667
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in libosmo-gprs[master]: WIP
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34666?usp=email )
Change subject: WIP
..
WIP
Change-Id: Iaa1813655b334781032b6d5caf711545d3613e2c
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/66/34666/1
diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c
index e577313..2260596 100644
--- a/src/rlcmac/tbf_ul_ass_fsm.c
+++ b/src/rlcmac/tbf_ul_ass_fsm.c
@@ -404,9 +404,11 @@
LOGPFSML(fi, LOGL_ERROR, "Rx Pkt Ul Ass: failed to
parse!\n");
// TODO: what to do if Pkt_ul_ass is "reject"? need to check
spec, depending on cause.
/* If RRBP contains valid data, schedule a response (PKT
CONTROL ACK or PKT RESOURCE REQ). */
+ LOGPFSML(fi, LOGL_NOTICE, "PESPIN: Rx Pkt Ul Ass: curr_fn=%u
S/P=%u\n", d->fn, d->dl_block->SP);
if (d->dl_block->SP) {
uint32_t poll_fn = rrbp2fn(d->fn, d->dl_block->RRBP);
uint32_t next_blk =
fn_next_block(fn_next_block(poll_fn));
+ LOGPFSML(fi, LOGL_NOTICE, "PESPIN: Rx Pkt Ul Ass:
poll_fn=%u reserve_fn=%u start_time_exists=%u start_time=%u\n", poll_fn,
next_blk, ctx->tbf_starting_time_exists, ctx->tbf_starting_time);
gprs_rlcmac_pdch_ulc_reserve(g_rlcmac_ctx->sched.ulc[d->ts_nr], poll_fn,
GPRS_RLCMAC_PDCH_ULC_POLL_UL_ASS,
ul_tbf_as_tbf(ctx->ul_tbf));
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34666?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Iaa1813655b334781032b6d5caf711545d3613e2c
Gerrit-Change-Number: 34666
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:41:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: Add .gitignore
Attention is currently required from: lynxis lazus, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 15:40:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: obs: add erlang/osmo-epdg to projects_osmocom .. obs: add erlang/osmo-epdg to projects_osmocom Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 --- M scripts/obs/lib/config.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 3b2518f..33aced8 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -45,6 +45,7 @@ # and ensure the rpm and deb packages build successfully in jenkins. projects_osmocom = [ "erlang/osmo_dia2gsup", +"erlang/osmo-epdg", "libasn1c", "libgtpnl", "libosmo-abis", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: obs: Fix typo in log line informing variable to be modified
..
obs: Fix typo in log line informing variable to be modified
Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7
---
M scripts/obs/lib/__init__.py
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 1f686e5..226015a 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -116,7 +116,7 @@
return package
print(f"ERROR: unknown package: {package}")
-print("See packages_osmocom and packages_other in obs/lib/config.py")
+print("See projects_osmocom and projects_other in obs/lib/config.py")
sys.exit(1)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7
Gerrit-Change-Number: 34665
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh for all projects
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email )
Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects
..
obs: srcpkg.py: Run generate_build_dep.sh for all projects
Adjust srcpkg.py to run a generate_build_dep.sh not only for
osmo_dia2gsup, but for any Osmocom project that has such a script. This
is in preparation for osmo-epdg, which will also have one.
Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4
---
M scripts/obs/lib/srcpkg.py
1 file changed, 27 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index cffb961..324bc66 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -103,13 +103,6 @@
return ""
-def prepare_project_osmo_dia2gsup():
-""" Run erlang/osmo_dia2gsup's generate_build_dep.sh script to download
-sources for dependencies. """
-lib.run_cmd("contrib/generate_build_dep.sh",
-cwd=lib.git.get_repo_path("erlang/osmo_dia2gsup"))
-
-
def prepare_project_open5gs():
""" Download the subproject sources here, so the package can be built in
OBS without Internet access. """
@@ -124,6 +117,17 @@
"-i", "debian/control"],
cwd=lib.git.get_repo_path("limesuite"))
+def run_generate_build_dep(project):
+""" Run contrib/generate_build_dep.sh if it exists in the given project, to
+to download sources for dependencies (see e.g. osmo_dia2gsup.git). """
+repo_path = lib.git.get_repo_path(project)
+script_path = "contrib/generate_build_dep.sh"
+
+if os.path.exists(f"{repo_path}/{script_path}"):
+print(f"{project}: running {script_path}")
+lib.run_cmd(script_path, cwd=repo_path)
+
+
def write_tarball_version(project, version):
repo_path = lib.git.get_repo_path(project)
@@ -182,6 +186,9 @@
print(f"{project}: running {project_specific_func}")
globals()[project_specific_func]()
+if project in lib.config.projects_osmocom:
+run_generate_build_dep(project)
+
lib.debian.build_source_package(project)
lib.debian.move_files_to_output(project)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4
Gerrit-Change-Number: 34662
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh for all projects
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:39:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh for all projects
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects .. Patch Set 2: (1 comment) Patchset: PS1: > Fine with it, feel free to take care of this patch and the other 2 on top :) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:39:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
Attention is currently required from: pespin. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: obs: Fix typo in log line informing variable to be modified .. obs: Fix typo in log line informing variable to be modified Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7 --- M scripts/obs/lib/__init__.py 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/34665/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7 Gerrit-Change-Number: 34665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh for all projects
Attention is currently required from: osmith. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects .. obs: srcpkg.py: Run generate_build_dep.sh for all projects Adjust srcpkg.py to run a generate_build_dep.sh not only for osmo_dia2gsup, but for any Osmocom project that has such a script. This is in preparation for osmo-epdg, which will also have one. Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/34662/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
Attention is currently required from: pespin. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: obs: add erlang/osmo-epdg to projects_osmocom .. obs: add erlang/osmo-epdg to projects_osmocom Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 --- M scripts/obs/lib/config.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/34664/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:18:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email ) Change subject: obs: Fix typo in log line informing variable to be modified .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7 Gerrit-Change-Number: 34665 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:18:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) Change subject: obs: add erlang/osmo-epdg to projects_osmocom .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:18:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project .. Patch Set 1: (1 comment) Patchset: PS1: > This would work, but how about we just run a `contrib/generate_build_dep. […] Fine with it, feel free to take care of this patch and the other 2 on top :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:17:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email )
Change subject: obs: Fix typo in log line informing variable to be modified
..
obs: Fix typo in log line informing variable to be modified
Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7
---
M scripts/obs/lib/__init__.py
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/34665/1
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 1f686e5..226015a 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -116,7 +116,7 @@
return package
print(f"ERROR: unknown package: {package}")
-print("See packages_osmocom and packages_other in obs/lib/config.py")
+print("See projects_osmocom and projects_other in obs/lib/config.py")
sys.exit(1)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7
Gerrit-Change-Number: 34665
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) Change subject: obs: add erlang/osmo-epdg to projects_osmocom .. obs: add erlang/osmo-epdg to projects_osmocom Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 --- M scripts/obs/lib/config.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/34664/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 3b2518f..33aced8 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -45,6 +45,7 @@ # and ensure the rpm and deb packages build successfully in jenkins. projects_osmocom = [ "erlang/osmo_dia2gsup", +"erlang/osmo-epdg", "libasn1c", "libgtpnl", "libosmo-abis", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project .. Patch Set 1: (1 comment) Patchset: PS1: This would work, but how about we just run a `contrib/generate_build_dep.sh` for any project, if it is in the git repository? (I could refactor it like that if you prefer) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 15:14:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/master: use same url scheme as gerrit jobs
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email ) Change subject: jobs/master: use same url scheme as gerrit jobs .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe992dd8027a8b8df8623abc57a590972443449f Gerrit-Change-Number: 34660 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:13:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 15:13:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Add debian build support
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support .. Add debian build support Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f --- A contrib/generate_build_dep.sh A contrib/osmo-epdg.service A contrib/systemd/osmo-epdg.service A debian/changelog A debian/compat A debian/control A debian/osmo-epdg.install A debian/rules 8 files changed, 98 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/63/34663/1 diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 000..409c2f5 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory of the osmo-epdg directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete +tar czf build_dep.tar.gz ./_checkouts diff --git a/contrib/osmo-epdg.service b/contrib/osmo-epdg.service new file mode 100644 index 000..bfa8293 --- /dev/null +++ b/contrib/osmo-epdg.service @@ -0,0 +1,15 @@ +[Unit] +Description=Osmocom ePDG (Evolved Packet Data Gateway) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-epdg.service b/contrib/systemd/osmo-epdg.service new file mode 100644 index 000..a62a972 --- /dev/null +++ b/contrib/systemd/osmo-epdg.service @@ -0,0 +1,16 @@ +[Unit] +Description=Osmocom DIAMETER to GSUP translator +After=osmo-hlr.service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..8b13789 --- /dev/null +++ b/debian/changelog @@ -0,0 +1 @@ + diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 000..c484b29 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: osmo-epdg +Maintainer: Osmocom team +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, + debhelper (>= 10) +Standards-Version: 4.5.0 + +Package: osmo-epdg +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom ePDG (Evolved Packet Data Gateway) + diff --git a/debian/osmo-epdg.install b/debian/osmo-epdg.install new file mode 100644 index 000..0840d06 --- /dev/null +++ b/debian/osmo-epdg.install @@ -0,0 +1,2 @@ +/contrib/systemd/osmo-epdg.service /lib/systemd/system/ +/_build/default/bin/osmo-epdg /usr/bin/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 000..89863f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi + rebar3 compile + rebar3 escriptize + rebar3 eunit + +override_dh_clean: + dh_clean + rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email )
Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
..
obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4
---
M scripts/obs/lib/srcpkg.py
1 file changed, 20 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/34662/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index cffb961..4eaaa47 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -102,13 +102,21 @@
return ""
+def _prepare_project_erlang_common(project):
+""" Run erlang/$(project)'s generate_build_dep.sh script to download
+sources for dependencies. """
+lib.run_cmd("contrib/generate_build_dep.sh",
+cwd=lib.git.get_repo_path("erlang/" + project))
def prepare_project_osmo_dia2gsup():
""" Run erlang/osmo_dia2gsup's generate_build_dep.sh script to download
sources for dependencies. """
-lib.run_cmd("contrib/generate_build_dep.sh",
-cwd=lib.git.get_repo_path("erlang/osmo_dia2gsup"))
+_prepare_project_erlang_common("osmo_dia2gsup")
+def prepare_project_osmo_epdg():
+""" Run erlang/osmo-epdg's generate_build_dep.sh script to download
+sources for dependencies. """
+_prepare_project_erlang_common("osmo-epdg")
def prepare_project_open5gs():
""" Download the subproject sources here, so the package can be built in
@@ -177,7 +185,7 @@
os.makedirs(lib.get_output_path(project))
lib.remove_cache_extra_files()
-project_specific_func = f"prepare_project_{os.path.basename(project)}"
+project_specific_func =
f"prepare_project_{os.path.basename(project).replace('-', '_')}"
if project_specific_func in globals():
print(f"{project}: running {project_specific_func}")
globals()[project_specific_func]()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4
Gerrit-Change-Number: 34662
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/master: use same url scheme as gerrit jobs
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email )
Change subject: jobs/master: use same url scheme as gerrit jobs
..
jobs/master: use same url scheme as gerrit jobs
Make it easier to copy entries from gerrit-verifications.yml to
master-builds.yml by using the same url schema in both.
Change-Id: Ibe992dd8027a8b8df8623abc57a590972443449f
---
M jobs/master-builds.yml
1 file changed, 30 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/34660/1
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 52ed298..dcf40ef 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -70,7 +70,9 @@
cmd: '{docker_run_ccache} {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh'
trigger:
email: jenkins-notificati...@lists.osmocom.org lafo...@gnumonks.org
-git_base_url: https://gerrit.osmocom.org
+gerrit_url: 'https://gerrit.osmocom.org'
+gitea_url: 'https://gitea.osmocom.org'
+repos_url: '{gerrit_url}/{repos}'
branches:
- master
ssh:
@@ -103,7 +105,7 @@
master-libosmo-netif, master-osmo-bts
- libosmo-dsp:
- git_base_url: https://gitea.osmocom.org/sdr
+ repos_url: '{gitea_url}/sdr/{repos}'
cmd: |
{docker_run_ccache} \
{docker_img} {timeout_cmd} sh -ex -c \
@@ -287,14 +289,14 @@
- binaries_ftp.osmocom.org
- docs_ftp.osmocom.org
- ice40-usbtrace:
- git_base_url: https://gitea.osmocom.org/electronics
+ repos_url: '{gitea_url}/electronics/{repos}'
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
{timeout_cmd} /build/contrib/jenkins.sh --publish'
ssh:
- binaries_ftp.osmocom.org
- docs_ftp.osmocom.org
- no2bootloader:
- git_base_url: https://github.com/no2fpga
+ repos_url: 'https://github.com/no2fpga/{repos}'
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
{timeout_cmd} /build/contrib/jenkins.sh --publish'
email: jenkins-notificati...@lists.osmocom.org lafo...@gnumonks.org
kre...@sysmocom.de 246...@gmail.com
@@ -303,7 +305,8 @@
- docs_ftp.osmocom.org
- osmo-fl2k:
- git_base_url: https://gitea.osmocom.org/sdr
+ repos_url: '{gitea_url}/sdr/{repos}'
+
- osmo-ggsn:
a1_name: GTP
a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]
@@ -322,7 +325,7 @@
- osmo-upf
- osmo-gmr:
- git_base_url: https://gitea.osmocom.org/satellite
+ repos_url: '{gitea_url}/satellite/{repos}'
email: jenkins-notificati...@lists.osmocom.org 246...@gmail.com
- osmo-gsm-manuals
@@ -344,7 +347,7 @@
master-osmo-hnbgw
- osmo-ir77:
- git_base_url: https://gitea.osmocom.org/satellite
+ repos_url: '{gitea_url}/satellite/{repos}'
email: jenkins-notificati...@lists.osmocom.org 246...@gmail.com
- osmo-mgw:
@@ -396,7 +399,7 @@
"$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh
- osmo-python-tests:
- git_base_url: https://gerrit.osmocom.org/python
+ repos_url: '{gerrit_url}/python/{repos}'
- osmo-sgsn:
a1_name: IU
@@ -455,7 +458,7 @@
- binaries_ftp.osmocom.org
- docs_ftp.osmocom.org
- simtrace:
- git_base_url: https://gitea.osmocom.org/sim-card
+ repos_url: '{gitea_url}/sim-card/{repos}'
email: jenkins-notificati...@lists.osmocom.org lafo...@gnumonks.org
kre...@sysmocom.de
- simtrace2:
cmd: '{docker_run_ccache} {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh --publish'
@@ -464,7 +467,7 @@
- binaries_ftp.osmocom.org
- docs_ftp.osmocom.org
- osmo-opencm3-projects:
- git_base_url: https://gitea.osmocom.org/electronics
+ repos_url: '{gitea_url}/electronics/{repos}'
cmd: '{docker_run} {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh --publish'
email: jenkins-notificati...@lists.osmocom.org lafo...@gnumonks.org
kre...@sysmocom.de
ssh:
@@ -496,7 +499,7 @@
{docker_img} {timeout_cmd} /build/contrib/jenkins.sh
- rtl-sdr:
- git_base_url: https://gitea.osmocom.org/sdr
+ repos_url: '{gitea_url}/sdr/{repos}'
email: lafo...@gnumonks.org st...@steve-m.de
- pysim:
@@ -525,12 +528,12 @@
concurrent: false
cmd: cd ./tests; {timeout_cmd} ./run-tests
slave_axis: !!python/tuple [simtester]
- git_base_url: https://gitea.sysmocom.de/sysmocom
+ repos_url:
[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email )
Change subject: jobs/master-builds: add erlang projects
..
jobs/master-builds: add erlang projects
Add the erlang projects found in gerrit-verifications to master-builds
too, as we have it with most other Osmocom projects.
Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026
---
M jobs/master-builds.yml
1 file changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/34661/1
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index dcf40ef..8b8d551 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -66,6 +66,7 @@
-e
PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
\
-v "$CCACHE_DIR:/ccache" \
docker_img: '$USER/debian-bookworm-build'
+docker_img_erlang: '$USER/debian-bookworm-erlang'
timeout_cmd: '/usr/bin/timeout 30m'
cmd: '{docker_run_ccache} {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh'
trigger:
@@ -270,6 +271,14 @@
-e WITH_MANUALS="$WITH_MANUALS" \
"$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins_bts_model.sh
"$BTS_MODEL"
+ - osmo_dia2gsup:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
+
+ - osmo-epdg:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
+
- osmo-e1-hardware:
a2_name: JOB_TYPE
a2: !!python/tuple ["firmware", "gateware", "manuals", "software"]
@@ -330,6 +339,10 @@
- osmo-gsm-manuals
+ - osmo_gsup:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
+
- osmo-gsm-tester:
cmd: '{docker_run} {docker_img} {timeout_cmd}
/build/contrib/jenkins-build-manuals.sh'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026
Gerrit-Change-Number: 34661
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: Fix typo in libosmocore.map
Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email ) Change subject: Fix typo in libosmocore.map .. Fix typo in libosmocore.map Fixes: 64ba9edf173cc16f9d94c94a423a8b7a5904efaf Change-Id: I0fb13fb4ef8160f3ac2cb1cb4dd6ea57fd04b5be --- M src/core/libosmocore.map 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 105a80a..6c02cd3 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -432,7 +432,7 @@ osmo_sock_mcast_subscribe; osmo_sock_mcast_ttl_set; osmo_sock_multiaddr_add_local_addr; -çosmo_sock_multiaddr_del_local_addr; +osmo_sock_multiaddr_del_local_addr; osmo_sock_set_dscp; osmo_sock_set_priority; osmo_sock_unix_init; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0fb13fb4ef8160f3ac2cb1cb4dd6ea57fd04b5be Gerrit-Change-Number: 34659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation .. Patch Set 3: Code-Review+1 (2 comments) File Makefile: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654/comment/ad9c0871_529bcbd6 PS2, Line 14: rm -rf _build/ > "No newline at end of right file." […] Done File src/osmo_epdg.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654/comment/7e7f596e_48748b04 PS2, Line 7:timer:sleep(infinity). > same here, missing newline (git is complaining) Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 14:56:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Fix typo in libosmocore.map
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email ) Change subject: Fix typo in libosmocore.map .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0fb13fb4ef8160f3ac2cb1cb4dd6ea57fd04b5be Gerrit-Change-Number: 34659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:51:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Fix typo in libosmocore.map
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email ) Change subject: Fix typo in libosmocore.map .. Fix typo in libosmocore.map Fixes: 64ba9edf173cc16f9d94c94a423a8b7a5904efaf Change-Id: I0fb13fb4ef8160f3ac2cb1cb4dd6ea57fd04b5be --- M src/core/libosmocore.map 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/34659/1 diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 105a80a..6c02cd3 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -432,7 +432,7 @@ osmo_sock_mcast_subscribe; osmo_sock_mcast_ttl_set; osmo_sock_multiaddr_add_local_addr; -çosmo_sock_multiaddr_del_local_addr; +osmo_sock_multiaddr_del_local_addr; osmo_sock_set_dscp; osmo_sock_set_priority; osmo_sock_unix_init; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0fb13fb4ef8160f3ac2cb1cb4dd6ea57fd04b5be Gerrit-Change-Number: 34659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 3: (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/a2b5c191_3a6660f1 PS2, Line 1447: 32 > Done Thanks for adding the comment. I still see a possible problem though. By doing `< 32` you're actually limiting number the neighbors you check here in this function, not the number of frequencies the SI10 can fit. Imagine having more than 32 neighbors in the list (weird, but still possible, right?). The current logic would not take those neighbors with `i >= 32` into account, despite they could be involved in group calls and could fit. Does that make sense? If yes, just limit to `nbv->data_len * 8` and rely on your overflow detection logic below. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:46:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus, pespin. Hello fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email to look at the new patch set (#3). Change subject: Initial work to have proper app compilation and escript generation .. Initial work to have proper app compilation and escript generation Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 --- A Makefile M rebar.config A rebar.lock R src/osmo_epdg.app.src A src/osmo_epdg.erl R src/osmo_epdg_app.erl R src/osmo_epdg_sup.erl 7 files changed, 67 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/54/34654/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: Fix indices of ARFCNs for measurement report
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email ) Change subject: Fix indices of ARFCNs for measurement report .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069 Gerrit-Change-Number: 34658 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 05 Oct 2023 14:30:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix selection of correct ARFCN at arfcn_from_freq_index()
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email ) Change subject: Fix selection of correct ARFCN at arfcn_from_freq_index() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7 Gerrit-Change-Number: 34657 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 05 Oct 2023 14:29:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:29:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email )
Change subject: jobs/gerrit-verifications: Add osmo-epdg
..
jobs/gerrit-verifications: Add osmo-epdg
Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f
---
M jobs/gerrit-verifications.yml
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 9317720..07f07f4 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -191,6 +191,12 @@
cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
pipeline_binpkgs: "debian:11 debian:12"
+ - osmo-epdg:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ gerrit_project: 'erlang/{repos}'
+ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
+ pipeline_binpkgs: "debian:11 debian:12"
+
- osmo-e1-hardware:
a2_name: JOB_TYPE
a2: !!python/tuple ["firmware", "gateware", "manuals", "software"]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f
Gerrit-Change-Number: 34655
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email ) Change subject: jobs/gerrit-verifications: Add osmo-epdg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f Gerrit-Change-Number: 34655 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:26:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: jobs/gerrit-verifications: Add osmo-epdg .. Patch Set 1: -Code-Review (1 comment) Patchset: PS1: yep, see https://gitea.osmocom.org/osmocom/osmo-ci/src/branch/master/jobs/README.adoc > jenkins-jobs update jobs/coverity.yml as discussed, I'll merge it and deploy it -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f Gerrit-Change-Number: 34655 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:26:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:25:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email ) Change subject: Initial work to have proper app compilation and escript generation .. Patch Set 2: (2 comments) File Makefile: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654/comment/31d8501b_09ef094f PS2, Line 14: rm -rf _build/ "No newline at end of right file." (shouldn't the text editor add it automatically?) File src/osmo_epdg.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654/comment/c1d0_26908d89 PS2, Line 7:timer:sleep(infinity). same here, missing newline (git is complaining) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 14:25:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: Fix indices of ARFCNs for measurement report
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email )
Change subject: Fix indices of ARFCNs for measurement report
..
Fix indices of ARFCNs for measurement report
The order of ARFCNs are described in TS 44.018 §10.5.2.20.
The function arfcn_from_freq_index() is re-used to get the ARFCNs in
correct order for the report.
Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069
---
M src/host/layer23/include/osmocom/bb/common/sysinfo.h
M src/host/layer23/src/mobile/gsm48_rr.c
2 files changed, 32 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/34658/1
diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
index 89d38ac..9efb248 100644
--- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
+++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
@@ -219,5 +219,6 @@
int gsm48_decode_mobile_alloc(struct gsm_sysinfo_freq *freq,
const uint8_t *ma, uint8_t len,
uint16_t *hopping, uint8_t *hopp_len, int si4);
+int16_t arfcn_from_freq_index(const struct gsm48_sysinfo *s, uint16_t index);
#endif /* _SYSINFO_H */
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index 8dca379..3200412 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -2538,32 +2538,30 @@
&& s->si5
&& (!s->nb_ext_ind_si5 || s->si5bis)) {
struct gsm48_rr_meas *rrmeas = >rrlayer.meas;
- int n = 0, i, refer_pcs;
+ int i, refer_pcs;
+ int16_t arfcn;
LOGP(DRR, LOGL_NOTICE, "Complete set of SI5* for BA(%d)\n",
s->nb_ba_ind_si5);
rrmeas->nc_num = 0;
refer_pcs = gsm_refer_pcs(cs->arfcn, s);
- /* collect channels from freq list (1..1023,0) */
- for (i = 1; i <= 1024; i++) {
- if ((s->freq[i & 1023].mask & FREQ_TYPE_REP)) {
- if (n == 32) {
- LOGP(DRR, LOGL_NOTICE, "SI5* report "
- "exceeds 32 BCCHs\n");
- break;
- }
- if (refer_pcs && i >= 512 && i <= 810)
- rrmeas->nc_arfcn[n] = i | ARFCN_PCS;
- else
- rrmeas->nc_arfcn[n] = i & 1023;
- rrmeas->nc_rxlev_dbm[n] = -128;
- LOGP(DRR, LOGL_NOTICE, "SI5* report arfcn %s\n",
- gsm_print_arfcn(rrmeas->nc_arfcn[n]));
- n++;
- }
+ /* Collect channels from freq list in correct order. */
+ for (i = 1; i < 32; i++) {
+ arfcn = arfcn_from_freq_index(s, i);
+ if (arfcn < 0)
+ break;
+ if (refer_pcs && arfcn >= 512 && arfcn <= 810)
+ rrmeas->nc_arfcn[i] = arfcn | ARFCN_PCS;
+ else
+ rrmeas->nc_arfcn[i] = arfcn;
+ rrmeas->nc_rxlev_dbm[i] = -128;
+ LOGP(DRR, LOGL_NOTICE, "SI5/SI5bis report arfcn %s
(index %d)\n",
+gsm_print_arfcn(rrmeas->nc_arfcn[i]), i);
}
- rrmeas->nc_num = n;
+ rrmeas->nc_num = i;
+ if (i == 32 && arfcn_from_freq_index(s, i) >= 0)
+ LOGP(DRR, LOGL_NOTICE, "SI5/SI5bis/SI5ter define more
than 32 channels.\n");
}
/* send sysinfo event to other layers */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069
Gerrit-Change-Number: 34658
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: Fix selection of correct ARFCN at arfcn_from_freq_index()
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email )
Change subject: Fix selection of correct ARFCN at arfcn_from_freq_index()
..
Fix selection of correct ARFCN at arfcn_from_freq_index()
The selection of ARFCN is described in TS 44.018 §10.5.2.20.
The frequencies found in SI5 and SI5bis are counted first, in the
following order: ARFCN 1..1023,0.
The frequencies found in SI5ter are counted afterwards, in the following
order: ARFCN 1..1023,0.
Related: OS#5782
Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7
---
M src/host/layer23/src/common/sysinfo.c
1 file changed, 28 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/34657/1
diff --git a/src/host/layer23/src/common/sysinfo.c
b/src/host/layer23/src/common/sysinfo.c
index 356f8eb..f541c85 100644
--- a/src/host/layer23/src/common/sysinfo.c
+++ b/src/host/layer23/src/common/sysinfo.c
@@ -1078,30 +1078,25 @@
return 0;
}
-static int16_t arfcn_from_freq_index(struct gsm48_sysinfo *s, uint16_t index)
+/* Get ARFCN from BCCH allocation found in SI5/SI5bis an SI5ter. See TS 44.018
§10.5.2.20. */
+int16_t arfcn_from_freq_index(const struct gsm48_sysinfo *s, uint16_t index)
{
uint16_t arfcn, i = 0;
- /* First, search for the P-GSM ARFCN. */
- for (arfcn = 1; arfcn < 124; arfcn++) {
- if (!(s->freq[arfcn].mask & FREQ_TYPE_REP))
+ /* Search for ARFCN found in SI5 or SI5bis. (first sub list) */
+ for (arfcn = 1; arfcn <= 1024; arfcn++) {
+ if (!(s->freq[arfcn & 1023].mask & (FREQ_TYPE_REP_5 |
FREQ_TYPE_REP_5bis)))
continue;
if (index == i++)
- return arfcn;
+ return arfcn & 1023;
}
- /* Second, search for ARFCN 0. */
- if ((s->freq[arfcn].mask & FREQ_TYPE_REP)) {
- if (index == i++)
- return arfcn;
- }
-
- /* Third, search for all other ARFCN. */
- for (arfcn = 125; arfcn < 1024; arfcn++) {
- if (!(s->freq[arfcn].mask & FREQ_TYPE_REP))
+ /* Search for ARFCN found in SI5ter. (second sub list) */
+ for (arfcn = 1; arfcn <= 1024; arfcn++) {
+ if (!(s->freq[arfcn & 1023].mask & FREQ_TYPE_REP_5ter))
continue;
if (index == i++)
- return arfcn;
+ return arfcn & 1023;
}
/* If not found, return EOF (-1) as idicator. */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7
Gerrit-Change-Number: 34657
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email ) Change subject: jobs/gerrit-verifications: Add osmo-epdg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f Gerrit-Change-Number: 34655 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:24:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: Add .gitignore
Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Thu, 05 Oct 2023 14:23:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: Initial work to have proper app compilation and escript generation
Attention is currently required from: fixeria, lynxis lazus. Hello fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email to look at the new patch set (#2). Change subject: Initial work to have proper app compilation and escript generation .. Initial work to have proper app compilation and escript generation Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 --- A Makefile M rebar.config A rebar.lock R src/osmo_epdg.app.src A src/osmo_epdg.erl R src/osmo_epdg_app.erl R src/osmo_epdg_sup.erl 7 files changed, 67 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/54/34654/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83b9117a1d611a1b992ddf052450509f9bd16964 Gerrit-Change-Number: 34654 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Attention: fixeria Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in ...osmo-epdg[master]: Add contrib/jenkins.sh
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email ) Change subject: Add contrib/jenkins.sh .. Add contrib/jenkins.sh Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 --- A contrib/jenkins.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/56/34656/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 000..87eae34 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +rebar3 compile +rebar3 escriptize +rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ide4a16bd0b1d788b44c79d6a7268c5eeab0ed272 Gerrit-Change-Number: 34656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email ) Change subject: jobs/gerrit-verifications: Add osmo-epdg .. Patch Set 1: (1 comment) Patchset: PS1: I need to submit this somehow with jenkins-job-builds right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f Gerrit-Change-Number: 34655 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 14:23:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/gerrit-verifications: Add osmo-epdg
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email )
Change subject: jobs/gerrit-verifications: Add osmo-epdg
..
jobs/gerrit-verifications: Add osmo-epdg
Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f
---
M jobs/gerrit-verifications.yml
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/34655/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 9317720..07f07f4 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -191,6 +191,12 @@
cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
pipeline_binpkgs: "debian:11 debian:12"
+ - osmo-epdg:
+ repos_url: '{gerrit_url}/erlang/{repos}'
+ gerrit_project: 'erlang/{repos}'
+ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
+ pipeline_binpkgs: "debian:11 debian:12"
+
- osmo-e1-hardware:
a2_name: JOB_TYPE
a2: !!python/tuple ["firmware", "gateware", "manuals", "software"]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34655?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I84accfc5065ed2e780c4ecb77885af61bc6fb72f
Gerrit-Change-Number: 34655
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 3: (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34625/comment/874d2c21_14bdee99 PS2, Line 946: rc > you're changing the behavior here: […] It was not checked in the original code. I will add a check here and simplify the function. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 05 Oct 2023 14:18:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 3: (6 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/42690333_1940fbb5 PS2, Line 13: For each BTS, an SI 10 is gerated with all other neighbor BTS. > generated Done Patchset: PS2: > SI10 is actually not needed for the call establishment, it's needed for > quicker cell change. […] The idea was to wait 3 seconds, which allows the MS to receive the SI5* messages before adding the SI10 (which relates to SI5*). There is not much benefit when sending SI10 earlier. Then I thought that it would be enough time for all the channels to be established in that BSC. There is no way to know at the BSC, if the channels requested from the MSC are complete. I could add an update to the SI10 for every channel that is established after the timer has expired. What do you think? File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/4bc38c72_0183a6f2 PS2, Line 1420: struct gsm_subscriber_connection *conn > should be `const` Done https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/f600693d_fad587ca PS2, Line 1424: *n_bts, *l_bts > cosmetic: better declare these two separately, so they're not hidden behind > the `s_bts` assignment. […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/cd6e512e_cf268bb5 PS2, Line 1447: 32 > where this limit is coming from? […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/7352572d_8f0c439c PS2, Line 1459: if (c->lchan->ts->trx->bts->c0->arfcn != arfcn) > can we maybe have a "i_bts = c->lchan->ts->trx->bts;" var here to avoid > dereferencing crazy amounts […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 05 Oct 2023 14:18:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
