osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38225?usp=email )
Change subject: jobs/gerrit: osmo-ttcn3-hacks: tweak make lines
......................................................................
jobs/gerrit: osmo-ttcn3-hacks: tweak make lines
* The "make clean" is not needed, as the osmo-ttcn3-hacks.git repository
is a fresh clone of code that was submitted to gerrit.
* The "make deps" is not needed, as "make compile" depends on the deps
target.
* Combine the cd and make lines.
* Remove ; at the end of lines, as it is not needed
* Switch " and ', so variables can be used with less escaping in future
patches in this block.
Change-Id: Iac179bfb26478ecab51f47e469b4be7b0f9a5a94
---
M jobs/gerrit-verifications.yml
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a21e42a..58752cd 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -442,13 +442,10 @@
-v "$PWD:/build" \
"registry.osmocom.org/osmocom-build/debian-bookworm-titan" \
{timeout_cmd} \
- sh -e -x -c "
- useradd --uid=1000 build;
- cd /build;
- su build -c 'make deps';
- su build -c 'make clean';
- su build -c 'make compile';
- "
+ sh -e -x -c '
+ useradd --uid=1000 build
+ su build -c "make -C /build compile"
+ '
pipeline_binpkgs: ""
- dahdi-tools:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38225?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iac179bfb26478ecab51f47e469b4be7b0f9a5a94
Gerrit-Change-Number: 38225
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(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>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38228?usp=email )
Change subject: jobs/gerrit: osmo-ttcn3-hacks: drop chown
......................................................................
jobs/gerrit: osmo-ttcn3-hacks: drop chown
The chown takes some time, do it once when building the docker image
instead of doing it for every gerrit verification run.
Depends: docker-playground Id51885d0929f4966b1a4a181b3453c06d7956b53
Change-Id: I4bea336097e8180b19b3afa41c0b984d93c21bd1
---
M jobs/gerrit-verifications.yml
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index f98eac9..73d66ca 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -444,7 +444,6 @@
{timeout_cmd} \
sh -e -x -c '
useradd --uid=1000 build
- chown -R build:build /osmo-ttcn3-hacks/deps
for i in /osmo-ttcn3-hacks/deps/*/; do
if ! [ -e /build/deps/"$(basename "$i")" ]; then
ln -s "$i" /build/deps/
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38228?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4bea336097e8180b19b3afa41c0b984d93c21bd1
Gerrit-Change-Number: 38228
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(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>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/38227?usp=email )
Change subject: debian-bookworm-titan: chown 1000 for deps
......................................................................
debian-bookworm-titan: chown 1000 for deps
Change the ownership of the "deps" directory to a not yet created user
with the ID 1000. This user gets created when the gerrit verifications
use the container for building. Changing the ownership of the deps
directory allows using them and updating them as needed (e.g. if the
patch in review changes a commit of one of the deps).
Chowning here once results in faster jobs, compared to if we did it
every time the gerrit verifications job ran.
Creating the user here would result in conflicts with other containers
depending on debian-bookworm-titan that may create their own user with
the same UID.
Related: osmo-ci I4bea336097e8180b19b3afa41c0b984d93c21bd1
Change-Id: Id51885d0929f4966b1a4a181b3453c06d7956b53
---
M debian-bookworm-titan/Dockerfile
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile
index c4af2ef..0ce6c43 100644
--- a/debian-bookworm-titan/Dockerfile
+++ b/debian-bookworm-titan/Dockerfile
@@ -71,6 +71,7 @@
apt-get clean
# Clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017)
+# chown: gerrit-verifications will potentially update the deps as UID=1000
RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \
make -j8 -C /osmo-ttcn3-hacks deps
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile
@@ -78,4 +79,5 @@
cd /osmo-ttcn3-hacks && \
git pull && \
make -j8 deps; \
- fi
+ fi && \
+ chown -R 1000:1000 /osmo-ttcn3-hacks/deps
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38227?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id51885d0929f4966b1a4a181b3453c06d7956b53
Gerrit-Change-Number: 38227
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/38227?usp=email )
Change subject: debian-bookworm-titan: chown 1000 for deps
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
feedback is addressed and this is trivial, giving +2 so I can merge all related patches now
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38227?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id51885d0929f4966b1a4a181b3453c06d7956b53
Gerrit-Change-Number: 38227
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 Sep 2024 12:50:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email )
Change subject: library: add generic Mutex API for parallel components
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206/comment/556ed9cc_d6df… :
PS2, Line 14: and there
: is no way for the PFCPEM to correlate which session belongs to which eNB.
If we cannot find a good PFCP IE to include such identity information in, 3GPP TS 29.244 Section 5.9 states we may add vendor-specific IEs anywhere and any implementation not understanding them shall just ignore them:
> Vendor-specific IE may be sent with any PFCP message. Vendor-specific IE may be added directly to a PFCP message, or by embedding it into a grouped IE.
> In a network with Vendor specific enhancements, unrecognized vendor specific IEs shall be handled as unknown optional IEs.
In terms of 3GPP standard IEs, we could include the IMSI of the UE in the "User ID" IE (29.244 Section 8.2.101) for the PFCP session establish request. This would at least allow us to support "one concurrent session establishment per UE". That should be fine for your current use case? With multiple different bearers (like establishing a video call with different voice + video bearers) that may not be sufficient itself...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id71f43bd5fc78d4bb4417d6c01fcff8112ea6032
Gerrit-Change-Number: 38206
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 Sep 2024 12:31:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38218?usp=email )
Change subject: Makefile: avoid fetching deps if not needed
......................................................................
Makefile: avoid fetching deps if not needed
Running `make deps` for the first time fetches all the dependencies.
Running `make deps` again currently results in unnecessary git-fetch
and get-checkout operations for each dependency.
This is not as bad as cloning dependencies from scratch every time,
but still takes time and triggers unnecessary requests to the servers.
It's also creating problems when building testsuites offline.
This patch makes the build system a bit smarter in a way that it would
only try to update dependencies if the 'deps/Makefile' was changed.
Change-Id: Iae98585f0a83b17596857eba8c2f51a785198580
Related: OS#6572
---
M Makefile
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/Makefile b/Makefile
index 2b806b8..38a8f60 100644
--- a/Makefile
+++ b/Makefile
@@ -75,14 +75,16 @@
# Eclipse GitLab has rate limiting and sometimes to many concurrent conns fail.
# If -jN fails, retry with -j1.
-.PHONY: deps
-deps:
+.make.deps: deps/Makefile
($(MAKE) $(PARALLEL_MAKE) -C deps || $(MAKE) -j1 -C deps)
+ touch $@
+
+.PHONY: deps
+deps: .make.deps
# deps-update target for backwards compat; now does the same as 'make deps'
.PHONY: deps-update
-deps-update:
- $(MAKE) -C deps
+deps-update: .make.deps
compile: $(foreach dir,$(SUBDIRS),$(dir)/compile)
clean: $(foreach dir,$(SUBDIRS),$(dir)/clean)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38218?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iae98585f0a83b17596857eba8c2f51a785198580
Gerrit-Change-Number: 38218
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38229?usp=email )
Change subject: iuup.c: Add more relevant spec references to the file
......................................................................
iuup.c: Add more relevant spec references to the file
Those are specs which are usually of interested for somebody opening the
iuup.c and iuup.h files in order to work on Tx/Rx/forward of IuUP frames
eg. on top of RTP.
Change-Id: I0cf70e84def2162c3c8621cdbbd8632b25276d70
---
M src/gsm/iuup.c
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/38229/1
diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c
index 16a6f5e..4991213 100644
--- a/src/gsm/iuup.c
+++ b/src/gsm/iuup.c
@@ -1,5 +1,9 @@
/*! \file iu_up.c
- * IuUP (Iu User Plane) according to 3GPP TS 25.415 */
+ * IuUP (Iu User Plane) according to 3GPP TS 25.415
+ * See also 3GPP TS 25.414 regarding data transport.
+ * See also 3GPP TS 29.414 and 3GPP TS 29.415 regarding Nb counterparts
+ * of the above specs.
+ */
/*
* (C) 2017 by Harald Welte <laforge(a)gnumonks.org>
*
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38229?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0cf70e84def2162c3c8621cdbbd8632b25276d70
Gerrit-Change-Number: 38229
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria.
laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email )
Change subject: library: add generic Mutex API for parallel components
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206/comment/61bcae5f_1a28… :
PS2, Line 14: and there
: is no way for the PFCPEM to correlate which session belongs to which eNB.
are we 100% sure this is the case? Can we not somehow make osmo-s1gw include some kind of IE that allows us to correlate which UE (Iu context, whatever) has caused that PFCP request? This would not only be useful here in the TTCN3 tests, but also any later debugging. Would be great if a PFCP message could be associated with the Iu connection when looking at traces in wireshark etc.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id71f43bd5fc78d4bb4417d6c01fcff8112ea6032
Gerrit-Change-Number: 38206
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 Sep 2024 12:18:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No