Attention is currently required from: jolly, fixeria.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146
to look at the new patch set (#5).
Change subject: Add codec list to *VGCS_VBS_AssignmentReq templates
......................................................................
Add codec list to *VGCS_VBS_AssignmentReq templates
AoIP, call ID and codec list must be included, if user plane is IP
based. If not, the fields must not be included.
Change-Id: Id3ce78ad795c418650ca924a953294c3380b8198
---
M library/BSSMAP_Templates.ttcn
1 file changed, 22 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/33146/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146
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: Id3ce78ad795c418650ca924a953294c3380b8198
Gerrit-Change-Number: 33146
Gerrit-PatchSet: 5
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33265 )
Change subject: Fix the BTS_Tests_LAPDm.TC_t200_n200 test
......................................................................
Fix the BTS_Tests_LAPDm.TC_t200_n200 test
The test failed, because testing retransmit timeout on DCCH would take
longer than guard timer. Instead of changing that timer, I decided to
use ACCH instead. Additional changes were required to make ACCH test
work properly.
https://osmocom.org/issues/5972
Change-Id: I2c328219b1a37d0f4623c5728143cd91976000a0
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 20 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/33265/1
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index edd974b..b4c2c33 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -1106,7 +1106,7 @@
/* Test if there are exactly N200+1 transmissions of I frames; inspired by 25.2.4.1 */
private function f_TC_t200_n200(charstring id) runs on ConnHdlr {
- var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0));
+ var RslLinkId link_id := valueof(ts_RslLinkID_SACCH(0));
var integer sapi := link_id.sapi;
var boolean is_sacch := false;
if (link_id.c == SACCH) {
@@ -1120,13 +1120,13 @@
fp_common_init();
/* some common altstep for meas res and other background noise */
- d := activate(as_ignore_background(true));
+ d := activate(as_ignore_background(not is_sacch));
RSL.clear;
LAPDM.clear;
f_establish_mo(link_id);
- var octetstring l3_mt := f_rnd_octstring(20);
+ var octetstring l3_mt := f_rnd_octstring(18);
RSL.send(ts_RSL_DATA_REQ(g_chan_nr, link_id, l3_mt));
/* first transmission, P = 0 */
LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_I(sapi, c_r:=cr_MT_CMD, p:=false,
@@ -1147,7 +1147,7 @@
/* break */
}
}
- [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_I(sapi, ?, ?, ?, ?, ?))) {
+ [] LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_I(sapi, ?, ?, ?, ?, ?))) {
setverdict(fail, "Received unexpected I frame");
}
[not is_sacch] as_lapdm_acch();
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33265
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: I2c328219b1a37d0f4623c5728143cd91976000a0
Gerrit-Change-Number: 33265
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/32121 )
Change subject: tests: $(BUILT_SOURCES) is not defined
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/32121
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I81dc30f6d6e3b25723f00d945c87b9c01c648cbf
Gerrit-Change-Number: 32121
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 12 Jun 2023 09:18:47 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33260 )
Change subject: tbf_{ul,dl}_fsm: Remove unneeded asserts
......................................................................
tbf_{ul,dl}_fsm: Remove unneeded asserts
Those are leftovers from the time where we had a single tbf_fsm for both
UL and DL TBF.
Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea
---
M src/tbf_dl_fsm.c
M src/tbf_ul_fsm.c
2 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c
index a0e47b7..65070d3 100644
--- a/src/tbf_dl_fsm.c
+++ b/src/tbf_dl_fsm.c
@@ -244,10 +244,8 @@
static void st_finished(struct osmo_fsm_inst *fi, uint32_t event, void *data)
{
struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv;
-
switch (event) {
case TBF_EV_DL_ACKNACK_MISS:
- OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF);
break;
case TBF_EV_FINAL_ACK_RECVD:
/* We received Final Ack (DL ACK/NACK) from MS. move to
@@ -309,10 +307,8 @@
static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data)
{
- struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv;
switch (event) {
case TBF_EV_DL_ACKNACK_MISS:
- OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF);
/* Ignore, we don't care about missed DL ACK/NACK poll timeouts
* anymore, we are already releasing the TBF */
break;
diff --git a/src/tbf_ul_fsm.c b/src/tbf_ul_fsm.c
index 8778e32..11ed8ab 100644
--- a/src/tbf_ul_fsm.c
+++ b/src/tbf_ul_fsm.c
@@ -171,7 +171,6 @@
switch (event) {
case TBF_EV_FIRST_UL_DATA_RECVD:
- OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF);
/* TS 44.060 7a.2.1.1: "The contention resolution is completed on
* the network side when the network receives an RLC data block that
* comprises the TLLI value that identifies the mobile station and the
@@ -222,7 +221,6 @@
ul_tbf_contention_resolution_success(tbf_as_ul_tbf(ctx->tbf));
break;
case TBF_EV_FINAL_UL_ACK_CONFIRMED:
- OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF);
new_ul_tbf_requested = (bool)data;
/* Ref the MS, otherwise it may be freed after ul_tbf is
* detached when sending event below. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33260
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea
Gerrit-Change-Number: 33260
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/32728 )
Change subject: contrib/jenkins: tweak shell logic
......................................................................
contrib/jenkins: tweak shell logic
Move the logic down to where make gets called, so we don't need the
variable. Print whether we use CLANG or GCC.
Don't put /opt/llvm-arm/bin infront of PATH unless building with CLANG.
Right now it doesn't seem to have e.g. an override for gcc, but the
files in that path may change when we update
LLVM-embedded-toolchain-for-Arm.
Related: OS#6026
Change-Id: Id768e0dbed9265f042b942e6699683723ca40a7c
---
M contrib/jenkins.sh
1 file changed, 28 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 1e2846c..e53a450 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -38,7 +38,6 @@
for build in $BUILDS; do
board=`echo $build | cut -d "/" -f 1`
app=`echo $build | cut -d "/" -f 2`
- [ "$app" == "dfu" ] && use_clang_for_bl=1 || use_clang_for_bl=0
case "$build" in
"owhw/cardem")
comb="combined"
@@ -57,9 +56,16 @@
;;
esac
echo
- echo "=============== $board / $app START =============="
- PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG="$use_clang_for_bl" BOARD="$board" APP="$app" $comb
- echo "=============== $board / $app RES:$? =============="
+ # Build the bootloader with clang, the rest with gcc (OS#5260, OS#6026)
+ if [ "$app" = "dfu" ]; then
+ echo "=============== $board / $app START (CLANG) =============="
+ PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" APP="$app" $comb
+ echo "=============== $board / $app RES:$? =============="
+ else
+ echo "=============== $board / $app START (GCC) =============="
+ make USE_CLANG=0 BOARD="$board" APP="$app" $comb
+ echo "=============== $board / $app RES:$? =============="
+ fi
done
echo
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/32728
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Id768e0dbed9265f042b942e6699683723ca40a7c
Gerrit-Change-Number: 32728
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: lynxis lazus.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32033 )
Change subject: WIP: gsup: add message type for osmo-epdg CEIA interface
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
still has a "WIP" label in the subject - but not marked as WIP in gerit. Should we still merge this, lynxis?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3
Gerrit-Change-Number: 32033
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Sun, 11 Jun 2023 19:44:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment