- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: make/Makefile: generalize passing additional build arguments

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27072 ) Change subject: make/Makefile: generalize passing additional build arguments ...................................................................... make/Makefile: generalize passing additional build arguments Building of some images may require additional options to be passed. Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f --- M jenkins-common.sh M make/Makefile 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/27072/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 7130fe2..3faf6a9 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -169,7 +169,7 @@ echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" make -C "${IMAGE_DIR_PREFIX}/${dir}" \ - PULL="$pull_arg" \ + BUILD_ARGS="$pull_arg" \ UPSTREAM_DISTRO="$upstream_distro_arg" \ DISTRO="$distro_arg" \ IMAGE="$REPO_USER/$i" \ diff --git a/make/Makefile b/make/Makefile index 34d5d25..b2d344e 100644 --- a/make/Makefile +++ b/make/Makefile @@ -37,7 +37,7 @@ OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master OPEN5GS_BRANCH?=main -PULL?= +BUILD_ARGS?= UPSTREAM_DISTRO?=debian:bullseye DISTRO?=debian-bullseye @@ -114,7 +114,7 @@ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ - $(PULL) -t $(IMAGE):latest . + $(BUILD_ARGS) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f Gerrit-Change-Number: 27072 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 ) Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > no commitlog rationale. […] I saw this is actively used in the kernel (and there it makes sense, indeed), and in open5gs. Where I believe using OSMO_UNLIKELY makes sense is OSMO_ASSERT, especially for osmo-{bsc,msc} where we assert() in lots of places 'just to be sure'. The scheduler in osmo-bts-trx could also benefit from this. I did not benchmark this though, so I cannot say how much do we gain... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 14:16:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: install dependencies using mk-build-deps

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 ) Change subject: open5gs-master: install dependencies using mk-build-deps ...................................................................... Patch Set 2: (2 comments) File open5gs-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/27070/comment/58cd1688_273… PS1, Line 31: RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO > Maybe install dependencies here too? Then it wouldn't need to download all packages from debian/cont […] Done https://gerrit.osmocom.org/c/docker-playground/+/27070/comment/0d1f41e1_5fd… PS1, Line 40: mk-build-deps -i -r -t 'apt-get --no-install-recommends -yV' > "apt-get build-dep ." should do the same, not sure if it internally uses mk-build-deps. […] Done, thanks for your suggestions! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 09:11:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: install dependencies using mk-build-deps

by fixeria

Attention is currently required from: fixeria. Hello osmith, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27070 to look at the new patch set (#2). Change subject: open5gs-master: install dependencies using mk-build-deps ...................................................................... open5gs-master: install dependencies using mk-build-deps This is a 3-rd party project, which may introduce new dependencies in the future. Rather than maintaining our own list of packages to install, let's employ 'apt-get build-dep'. This tool parses 'debian/control' and installs all dependencies automatically. Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Related: SYS#5602 --- M open5gs-master/Dockerfile 1 file changed, 16 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/27070/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Set up diameter for open5gs

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 ) Change subject: ggsn: Set up diameter for open5gs ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061/comment/b8c6bb4d_6357… PS1, Line 194: friend > Why 'friend'? Is it [going to be] used by some other module? Resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 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: Iedadb98be2a2e851b75e4e67c22bca7047191fec Gerrit-Change-Number: 27061 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 09:06:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: Add ttcn3-ggsn-ogs testsuite

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 ) Change subject: Add ttcn3-ggsn-ogs testsuite ...................................................................... Patch Set 3: Code-Review+2 (2 comments) File ttcn3-ggsn-test-ogs/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/27063/comment/b60f5a57_38a… PS1, Line 1: ../ttcn3-ggsn-test/jenkins-ogs.sh > "No newline at end of revision file" Not addressed, but not critical. File ttcn3-ggsn-test/jenkins-ogs.sh: https://gerrit.osmocom.org/c/docker-playground/+/27063/comment/6f48a840_b86… PS1, Line 42: /data/open5gs-smfd.out > Yes, it really helped. […] Makes sense, thanks! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49 Gerrit-Change-Number: 27063 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 09:05:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: Add ttcn3-ggsn-ogs testsuite

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 ) Change subject: Add ttcn3-ggsn-ogs testsuite ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49 Gerrit-Change-Number: 27063 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 18:03:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Add module parameter to run tests against open5gs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 ) Change subject: ggsn: Add module parameter to run tests against open5gs ...................................................................... ggsn: Add module parameter to run tests against open5gs Change-Id: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 634534f..63e0696 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -35,6 +35,11 @@ const integer GTP1C_PORT := 2123; const integer GTP1U_PORT := 2152; + type enumerated GGSN_Impl { + GGSN_IMPL_OSMOCOM, + GGSN_IMPL_OPEN5GS + }; + modulepar { /* Default IP addresses. May be overridden by GGSN_Tests configuration files. */ @@ -65,6 +70,8 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ + + GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM; } type set PdpContext { @@ -197,9 +204,11 @@ g_c_seq_nr := f_rnd_int(65535); g_d_seq_nr := f_rnd_int(65535); - f_init_vty(); - f_vty_set_gpdu_txseq(use_gtpu_txseq); - f_vty_enable_echo_interval(g_use_echo); + if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) { + f_init_vty(); + f_vty_set_gpdu_txseq(use_gtpu_txseq); + f_vty_enable_echo_interval(g_use_echo); + } } /* Altstep implementing responses to any incoming echo requests */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 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: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8 Gerrit-Change-Number: 27060 Gerrit-PatchSet: 1 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

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: Add ttcn3-ggsn-ogs testsuite

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 ) Change subject: Add ttcn3-ggsn-ogs testsuite ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49 Gerrit-Change-Number: 27063 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 16:12:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: install dependencies using mk-build-deps

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 ) Change subject: open5gs-master: install dependencies using mk-build-deps ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: agreeing with osmith' comments -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 16:12:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log