- gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: ttcn3-s1gw-test: start osmo-s1gw container with --user=root
by fixeria 23 Jun '24

23 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37277?usp=email ) Change subject: ttcn3-s1gw-test: start osmo-s1gw container with --user=root ...................................................................... ttcn3-s1gw-test: start osmo-s1gw container with --user=root For some reason, on Arch with docker 26.1.3 it implicitly starts with --user=root, while with docker 20.10.5 on Debian bookworm it starts with --user=build. This results in permission errors: + ip addr add 172.18.74.100/24 dev eth0 RTNETLINK answers: Operation not permitted + true + ip addr add 172.18.74.200/24 dev eth0 RTNETLINK answers: Operation not permitted Pass --user=root explicitly to bring consistency and fix those. Hopefully, ttcn3-s1gw-test will be passing on Jenkins with this patch. Change-Id: I5cc67d1c3192fd55560c16c8cc44b13b2c9b3e98 Fixes: 9ca9bed "ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw" --- M ttcn3-s1gw-test/jenkins.sh 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/77/37277/1 diff --git a/ttcn3-s1gw-test/jenkins.sh b/ttcn3-s1gw-test/jenkins.sh index 78a9624..f00987d 100755 --- a/ttcn3-s1gw-test/jenkins.sh +++ b/ttcn3-s1gw-test/jenkins.sh @@ -23,6 +23,7 @@ echo "Starting container with osmo-s1gw" docker run --rm \ $(docker_network_params $SUBNET 100) \ + --user=root \ --ulimit core=-1 \ --cap-add=NET_ADMIN \ -e "ERL_FLAGS=-config /data/osmo-s1gw.config" \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37277?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: I5cc67d1c3192fd55560c16c8cc44b13b2c9b3e98 Gerrit-Change-Number: 37277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: split off f_mo_call_establish__handle_assignment_request()
by fixeria 22 Jun '24

22 Jun '24

Attention is currently required from: laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email ) Change subject: msc: split off f_mo_call_establish__handle_assignment_request() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?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: I98c6171a592dfe1573e15136c4ecf4ff234048d7 Gerrit-Change-Number: 35052 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jun 2024 20:24:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: debian-{bullseye,bookworm}-erlang: fix non-alphabetic pkg order
by fixeria 22 Jun '24

22 Jun '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37275?usp=email ) Change subject: debian-{bullseye,bookworm}-erlang: fix non-alphabetic pkg order ...................................................................... debian-{bullseye,bookworm}-erlang: fix non-alphabetic pkg order Purely cosmetic change, bringing a bit of consistency. Change-Id: I956a15304cbdcdc5572e181dcefd0da884b8fc63 --- M debian-bookworm-erlang/Dockerfile M debian-bullseye-erlang/Dockerfile 2 files changed, 13 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian-bookworm-erlang/Dockerfile b/debian-bookworm-erlang/Dockerfile index ec5ed52..1fe52e7 100644 --- a/debian-bookworm-erlang/Dockerfile +++ b/debian-bookworm-erlang/Dockerfile @@ -24,10 +24,10 @@ apt-get install -y --no-install-recommends \ build-essential \ git \ + netcat-openbsd \ procps \ tcpdump \ vim \ - netcat-openbsd \ wget \ && \ apt-get clean diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index 9a90c0c..be158c0 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -25,10 +25,10 @@ apt-get -y install \ build-essential \ git \ + netcat-openbsd \ procps \ tcpdump \ vim \ - netcat-openbsd \ wget \ && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37275?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: I956a15304cbdcdc5572e181dcefd0da884b8fc63 Gerrit-Change-Number: 37275 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: debian-{bullseye,bookworm}-erlang: install iproute2
by fixeria 22 Jun '24

22 Jun '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37276?usp=email ) Change subject: debian-{bullseye,bookworm}-erlang: install iproute2 ...................................................................... debian-{bullseye,bookworm}-erlang: install iproute2 Change-Id: I753a8c97c17e6a143dd96b168ddc88400f0fc02d --- M debian-bookworm-erlang/Dockerfile M debian-bullseye-erlang/Dockerfile M osmo-epdg-master/Dockerfile 3 files changed, 11 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian-bookworm-erlang/Dockerfile b/debian-bookworm-erlang/Dockerfile index 1fe52e7..60e7583 100644 --- a/debian-bookworm-erlang/Dockerfile +++ b/debian-bookworm-erlang/Dockerfile @@ -24,6 +24,7 @@ apt-get install -y --no-install-recommends \ build-essential \ git \ + iproute2 \ netcat-openbsd \ procps \ tcpdump \ diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index be158c0..4abb7b6 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -25,6 +25,7 @@ apt-get -y install \ build-essential \ git \ + iproute2 \ netcat-openbsd \ procps \ tcpdump \ diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile index cdef31e..a5e9b14 100644 --- a/osmo-epdg-master/Dockerfile +++ b/osmo-epdg-master/Dockerfile @@ -4,14 +4,6 @@ # Arguments used after FROM must be specified again ARG DISTRO -# $distro-erlang switched to user build, but we need to install more stuff beforehand: -USER root -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - iproute2 && \ - apt-get clean -USER build - WORKDIR /tmp ARG OSMO_EPDG_BRANCH="master" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37276?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: I753a8c97c17e6a143dd96b168ddc88400f0fc02d Gerrit-Change-Number: 37276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by fixeria 22 Jun '24

22 Jun '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw The S1GW container gets assigned the primary addr 172.18.10.100/24 by docker_network_params(). The secondary addr 172.18.10.200/24, which is used for eNB connections, needs to be assigned manually. This patch finally makes ttcn3-s1gw-test pass. Change-Id: I109a5feaca5acf050008e883cc8b4e1e28beebab Related: SYS#6772 --- M ttcn3-s1gw-test/jenkins.sh A ttcn3-s1gw-test/s1gw.sh 2 files changed, 29 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/ttcn3-s1gw-test/jenkins.sh b/ttcn3-s1gw-test/jenkins.sh index 9fcf5f1..78a9624 100755 --- a/ttcn3-s1gw-test/jenkins.sh +++ b/ttcn3-s1gw-test/jenkins.sh @@ -14,6 +14,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/s1gw-tester/S1GW_Tests.cfg" mkdir $VOL_BASE_DIR/s1gw +cp s1gw.sh $VOL_BASE_DIR/s1gw/ cp osmo-s1gw.config $VOL_BASE_DIR/s1gw/ network_create @@ -23,10 +24,13 @@ docker run --rm \ $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ + --cap-add=NET_ADMIN \ + -e "ERL_FLAGS=-config /data/osmo-s1gw.config" \ -v $VOL_BASE_DIR/s1gw:/data \ --name ${BUILD_TAG}-s1gw -d \ $DOCKER_ARGS \ - $REPO_USER/osmo-s1gw-$IMAGE_SUFFIX + $REPO_USER/osmo-s1gw-$IMAGE_SUFFIX \ + /bin/sh -c "/data/s1gw.sh > /data/osmo-s1gw.log 2>&1" # Give some time to osmo-s1gw to be fully started; it's a bit slow... sleep 2 diff --git a/ttcn3-s1gw-test/s1gw.sh b/ttcn3-s1gw-test/s1gw.sh new file mode 100755 index 0000000..e212aa2 --- /dev/null +++ b/ttcn3-s1gw-test/s1gw.sh @@ -0,0 +1,8 @@ +#!/bin/sh -ex + +# the subnet prefix is to be modified by network_replace_subnet_in_configs() +ip addr add 172.18.10.100/24 dev eth0 || true # primary address already set by docker_network_params() +ip addr add 172.18.10.200/24 dev eth0 # secondary address for eNB -> S1GW connections + +# drop the root privileges and finally start osmo-s1gw +su build -c "/tmp/osmo-s1gw/_build/default/bin/osmo-s1gw" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?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: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by fixeria 22 Jun '24

22 Jun '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File ttcn3-s1gw-test/s1gw.sh: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/ab4bf171_250… PS2, Line 8: su build -c "/tmp/osmo-s1gw/_build/default/bin/osmo-s1gw" > is the env inherited here when running through su? Yes, I also had this question and confirmed by testing manually. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?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: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jun 2024 19:33:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by pespin 22 Jun '24

22 Jun '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File ttcn3-s1gw-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/e6fb16f4_11e… PS2, Line 28: -e "ERL_FLAGS=-config /data/osmo-s1gw.config" \ You can probably simply move this inside the s1gw.sh since you only need it really to run the erlang eunit, but ok. File ttcn3-s1gw-test/s1gw.sh: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/1707fd51_a43… PS2, Line 8: su build -c "/tmp/osmo-s1gw/_build/default/bin/osmo-s1gw" is the env inherited here when running through su? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?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: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jun 2024 17:41:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: debian-{bullseye,bookworm}-erlang: install iproute2
by pespin 22 Jun '24

22 Jun '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37276?usp=email ) Change subject: debian-{bullseye,bookworm}-erlang: install iproute2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37276?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: I753a8c97c17e6a143dd96b168ddc88400f0fc02d Gerrit-Change-Number: 37276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jun 2024 17:38:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: debian-{bullseye,bookworm}-erlang: fix non-alphabetic pkg order
by pespin 22 Jun '24

22 Jun '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37275?usp=email ) Change subject: debian-{bullseye,bookworm}-erlang: fix non-alphabetic pkg order ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37275?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: I956a15304cbdcdc5572e181dcefd0da884b8fc63 Gerrit-Change-Number: 37275 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jun 2024 17:38:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by fixeria 21 Jun '24

21 Jun '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... Patch Set 2: (1 comment) File ttcn3-s1gw-test/S1GW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/bbcc07b4_8c8… PS1, Line 10: S1GW_Tests.mp_s1gw_enb_ip := "172.18.10.100"; > I don't see the problem (yet) tbh. […] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?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: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jun 2024 20:59:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log