Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31103 )
Change subject: FR testsuites: clean up all networks before start
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
Gerrit-Change-Number: 31103
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:57:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31103 )
Change subject: FR testsuites: clean up all networks before start
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
Gerrit-Change-Number: 31103
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:51:05 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/31103
to look at the new patch set (#2).
Change subject: FR testsuites: clean up all networks before start
......................................................................
FR testsuites: clean up all networks before start
Add a new network_clean_remove_all_ttcn3 function and use it in the fr
related testsuites to ensure no network is running before the test
starts. We just had the situation where the network link between
gtp0-deb10fr (where these testsuites run exclusively, and only one at a
time) and the jenkins host went down. And so the clean up trap
apparently did not run and starting a new test fails as the old network
still exists and has the network devices attached.
Related: OS#5802
Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
---
M jenkins-common.sh
M ttcn3-fr-test/jenkins.sh
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-ns-test/jenkins-fr.sh
4 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/31103/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
Gerrit-Change-Number: 31103
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31103 )
Change subject: FR testsuites: clean up all networks before start
......................................................................
FR testsuites: clean up all networks before start
Add a new network_clean_remove_all_ttcn3 function and use it in the fr
related testsuites to ensure no network is running before the test
starts. We just had the situation where the network link between
gtp0-deb10fr (where these testsuites run exclusively, and only one at a
time) and the jenkins host went down. And so the clean up trap
apparently did not run and starting a new test fails as the old network
still exists and has the network devices attached.
Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
---
M jenkins-common.sh
M ttcn3-fr-test/jenkins.sh
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-ns-test/jenkins-fr.sh
4 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/31103/1
diff --git a/jenkins-common.sh b/jenkins-common.sh
index ef0a3fc..a607f9a 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -262,6 +262,35 @@
docker network remove $NET_NAME
}
+# Clean and remove all docker networks related to ttcn3 testing. This prevents
+# running testsuites in parallel, so usually we don't want this and rely on the
+# clean_up_trap to clean the network. But on e.g. gtp0-deb10fr this gets used
+# as we only run one testsuite at once and it has dahdi netdevices attached.
+# Due connection loss, it may not be cleaned up there and so another testsuite
+# cannot start.
+network_clean_remove_all_ttcn3() {
+ local networks
+ local i
+
+ networks="$(docker network ls --format '{{.Name}}' | grep ^ttcn3- || true)"
+
+ if [ -z "$networks" ]; then
+ return
+ fi
+
+ set +x
+ echo "Removing stale network and containers..."
+ set -x
+
+ for i in $networks; do
+ NET_NAME="$i"
+ network_clean
+ network_remove
+ done
+
+ unset NET_NAME
+}
+
network_replace_subnet_in_configs() {
set +x
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index 9122063..12e14a5 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -30,6 +30,7 @@
mkdir $VOL_BASE_DIR/unix
+network_clean_remove_all_ttcn3
network_create
network_replace_subnet_in_configs
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index ab62bc1..1c53173 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -33,6 +33,7 @@
mkdir $VOL_BASE_DIR/unix
+network_clean_remove_all_ttcn3
network_create
network_replace_subnet_in_configs
diff --git a/ttcn3-ns-test/jenkins-fr.sh b/ttcn3-ns-test/jenkins-fr.sh
index 3b609ab..b6af67f 100755
--- a/ttcn3-ns-test/jenkins-fr.sh
+++ b/ttcn3-ns-test/jenkins-fr.sh
@@ -29,6 +29,7 @@
mkdir $VOL_BASE_DIR/ns
cp fr/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/
+network_clean_remove_all_ttcn3
network_create
network_replace_subnet_in_configs
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6a9464a11edcba978be08764bec9de19760a5c77
Gerrit-Change-Number: 31103
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin, fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 )
Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI
......................................................................
Patch Set 3:
(2 comments)
File src/rlcmac/gre.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/8ce5f9b8_b58fa759
PS3, Line 72: /* TODO: here a new UL TBF will be created if not available yet */
> Yes, I'm adding code modules in a step-by-step way, so that it's not a final code bomb with 30 files […]
Makes sense to do it that way. Sometimes a TODO is kept unintentionally though, so that's why I keep asking about them.
File src/rlcmac/llc_queue.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/34b92ffd_7332e537
PS3, Line 196: /* rate_ctr_inc(CTR_LLC_FRAME_DROPPED); */
> I left it there on purpose so that a potential counter can be identified quickly and added there in […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e
Gerrit-Change-Number: 31098
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:36:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31023 )
Change subject: pcu_l1_if: ignore frame numbers that exceed the valid range
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/31023/comment/668efdd7_021fa4a5
PS2, Line 627: if (rach_ind->fn > GSM_TDMA_HYPERFRAME - 1)
I would also use OSMO_UNLIKELY here.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31023
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib0cf1738be07733c95fc6c459a8a7c4cb2eeef26
Gerrit-Change-Number: 31023
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:15:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31102 )
Change subject: pcuif_proto: add indication to communicate E1 parameters
......................................................................
Patch Set 1:
(1 comment)
File include/osmocom/pcu/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-pcu/+/31102/comment/87335f71_8cf069dd
PS1, Line 263: uint8_t pdch_trx_no;
we use trx_nr and ts_nr everywhere afaict, better use same names.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31102
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301
Gerrit-Change-Number: 31102
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:11:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 )
Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI
......................................................................
Patch Set 3:
(1 comment)
File src/rlcmac/llc_queue.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/f9fb0069_1f341ace
PS3, Line 155: break;
> does this intentionally only break the inner loop?
Good catch, this is wrong :) that's because I added an extra axis of priorities and updated the code but didn't see what you mention. I'll fix it.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e
Gerrit-Change-Number: 31098
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:08:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 )
Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI
......................................................................
Patch Set 3:
(2 comments)
File src/rlcmac/gre.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/a0cf1290_1a001789
PS3, Line 72: /* TODO: here a new UL TBF will be created if not available yet */
> I guess you kept this on purpose?
Yes, I'm adding code modules in a step-by-step way, so that it's not a final code bomb with 30 files and 50k lines which will be impossible to review.
File src/rlcmac/llc_queue.c:
https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/30042095_1b7a4e2a
PS3, Line 196: /* rate_ctr_inc(CTR_LLC_FRAME_DROPPED); */
> commented out code. […]
I left it there on purpose so that a potential counter can be identified quickly and added there in the future.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e
Gerrit-Change-Number: 31098
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 30 Jan 2023 12:06:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment