osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36511?usp=email )
Change subject: kernel-test/kernel-build: update net-next branch
......................................................................
kernel-test/kernel-build: update net-next branch
The branch of net-next is now called main. Update the default
KERNEL_BRANCH to main, as the default KERNEL_URL points to net-next.git.
Related: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/
Change-Id: Ic4b13c3cbc0933db9d520e6d737c45b6b08e8c48
fixup
Change-Id: Id7544960c50c948231046882e4d76085e8180f10
---
M README.md
M scripts/kernel-test/kernel-build.sh
2 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/36511/1
diff --git a/README.md b/README.md
index 4c6c40a..6c2c989 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@
* `KERNEL_REMOTE_NAME`: git remote name (to add multiple git
repositories in the same local linux clone, default: net-next)
* `KERNEL_URL`: git remote url (default: net-next.git on kernel.org)
-* `KERNEL_BRANCH` branch to checkout (default: master)
+* `KERNEL_BRANCH` branch to checkout (default: main)
* `KERNEL_SKIP_REBUILD`: set to 1 to not build the kernel again if already
built with `KERNEL_BUILD=1`
* `KERNEL_SKIP_SMOKE_TEST`: don't boot up the kernel in QEMU once before
diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh
index 9bd8064..bbf3e43 100755
--- a/scripts/kernel-test/kernel-build.sh
+++ b/scripts/kernel-test/kernel-build.sh
@@ -3,7 +3,7 @@
KERNEL_REMOTE_NAME="${KERNEL_REMOTE_NAME:-net-next}"
KERNEL_URL="${KERNEL_URL:-https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git}"
-KERNEL_BRANCH="${KERNEL_BRANCH:-master}"
+KERNEL_BRANCH="${KERNEL_BRANCH:-main}"
KERNEL_DIR=/cache/linux
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36511?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: Id7544960c50c948231046882e4d76085e8180f10
Gerrit-Change-Number: 36511
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36509?usp=email )
Change subject: ttcn3-ggsn-test-kernel-latest-net-next: update net-next branch
......................................................................
ttcn3-ggsn-test-kernel-latest-net-next: update net-next branch
The branch of net-next is now called main. By using the old name, the
jenkins job was checking out a 6.3 kernel, we are now at 6.9 rcs.
Related: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/
Change-Id: Ieee448c514bc0ff457b9d17c8b12ee00953995d2
---
M jobs/ttcn3-testsuites.yml
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/09/36509/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index a560364..aee439e 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -285,7 +285,7 @@
export KERNEL_BUILD=1
export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git"
export KERNEL_REMOTE_NAME="net-next"
- export KERNEL_BRANCH="master"
+ export KERNEL_BRANCH="main"
;;
ttcn3-ggsn-test-kernel-latest-torvalds)
DIR="ttcn3-ggsn-test"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36509?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: Ieee448c514bc0ff457b9d17c8b12ee00953995d2
Gerrit-Change-Number: 36509
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith, pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by pespin, Verified+1 by Jenkins Builder
Change subject: jobs/ttcn3: …-pablo-gtp: don't wipe workspace
......................................................................
jobs/ttcn3: …-pablo-gtp: don't wipe workspace
The ttcn3-ggsn-test-kernel-* jobs should not wipe their workspace, so we
can avoid shallow-cloning the kernel if the commit did not change.
The way the scripts in docker-playground.git are written, this also
caused a permission error.
Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba
---
M jobs/ttcn3-testsuites.yml
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/36486/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36486?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: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba
Gerrit-Change-Number: 36486
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?usp=email )
Change subject: msc: fix race condition in TC_mm_id_resp_no_identity
......................................................................
msc: fix race condition in TC_mm_id_resp_no_identity
This testcase is failing sporadically ever since it was introduced
back in 2019, during 36C3. The problem is that osmo-msc does not
react to the malformed MM IDENTITY RESPONSE immediately, but only
after timeout of timer X1 (5 seconds, by default); while the
testsuite expects the LU REJECT to be received within 5 seconds.
We should ideally fix osmo-msc to react immediately, but for now
let's enlarge the LU REJECT waiting timeout in the testcase.
Change-Id: I5d2b5d49df8f7ae1eb12fc137f4256fe6fab9117
Related: OS#6426, OS#4340
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
2 files changed, 28 insertions(+), 8 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index be12fae..6f8078b 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -916,11 +916,11 @@
}
}
-function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr {
+function f_expect_lu_reject(template OCT1 cause := ?, float Tval := 5.0) runs on BSC_ConnHdlr {
var PDU_DTAP_MT dtap_mt;
- timer T := 5.0;
+ timer T;
- T.start;
+ T.start(Tval);
alt {
[] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(cause))) {
setverdict(pass);
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 52a5c2f..513e346 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -6616,15 +6616,13 @@
vc_conn.done;
}
+/* Test how the MSC handles a malformed MM IDENTITY RESPONSE with no identity. */
friend function f_tc_mm_id_resp_no_identity(charstring id, BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
- pars.tmsi := 'FFFFFFFF'O;
f_init_handler(pars);
- f_create_gsup_expect(hex2str(g_pars.imsi));
-
/* Initiate Location Updating using an unknown TMSI */
- f_bssap_compl_l3(f_build_lu_tmsi(pars.tmsi));
+ f_bssap_compl_l3(f_build_lu_tmsi('FFFFFFFF'O));
/* Expect an Identity Request, send response with no identity */
BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI)));
@@ -6641,7 +6639,10 @@
}
})));
- f_expect_lu_reject();
+ /* XXX: Current osmo-msc does not react on bad/malformed MM IDENTITY RESPONSE immediately.
+ * It instead relies on expiry of timer X1, which is set to 5.0 seconds by default. This
+ * is not good (DoS vector) and should ideally be fixed, but for now just work it around. */
+ f_expect_lu_reject(Tval := 5.0 + 1.0);
f_expect_clear();
}
testcase TC_mm_id_resp_no_identity() runs on MTC_CT {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36502?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: I5d2b5d49df8f7ae1eb12fc137f4256fe6fab9117
Gerrit-Change-Number: 36502
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels.
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email )
Change subject: use json to decode counters from nftables
......................................................................
Patch Set 5:
(2 comments)
File src/osmo-hnbgw/nft_kpi.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15524):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/1cbefed0_686fda1e
PS5, Line 266: json_array_foreach (nftables, i, item) {
space prohibited between function name and open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15524):
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485/comment/c433aa74_85485d32
PS5, Line 294: json_array_foreach (expr, j, expr_item) {
space prohibited between function name and open parenthesis '('
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b
Gerrit-Change-Number: 36485
Gerrit-PatchSet: 5
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 03 Apr 2024 00:53:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36507?usp=email )
Change subject: esim.es2p: Permit ApiParamInteger to be an actual integer
......................................................................
esim.es2p: Permit ApiParamInteger to be an actual integer
Usually, the specifications say that the integer type is actually
transmitted as a JSON string type. However, it seems some
implementations do return a native JSON integer type. Let's be
tolerant in that regard.
Change-Id: I5b47f8bba01225d53eff2ca086e53a2133abed7f
---
M pySim/esim/es2p.py
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/36507/1
diff --git a/pySim/esim/es2p.py b/pySim/esim/es2p.py
index 32d1ef8..af45b0b 100644
--- a/pySim/esim/es2p.py
+++ b/pySim/esim/es2p.py
@@ -86,6 +86,8 @@
@classmethod
def verify_encoded(cls, data):
+ if isinstance(data, int):
+ return
if not data.isdecimal():
raise ValueError('integer (%s) contains non-decimal characters' % data)
assert str(int(data)) == data
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36507?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I5b47f8bba01225d53eff2ca086e53a2133abed7f
Gerrit-Change-Number: 36507
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange