Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40383?usp=email )
Change subject: log_merge.sh: Merge all logs if no test cases are found
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40383?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: Ifc68e42022e8b2990d3c5221b3901f255e4e759b
Gerrit-Change-Number: 40383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 27 May 2025 16:08:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40383?usp=email )
Change subject: log_merge.sh: Merge all logs if no test cases are found
......................................................................
log_merge.sh: Merge all logs if no test cases are found
This can happen for instance if titan exits with an error during startup
even before starting any test.
In that scenario, titan still writes stuff to a file (eg.
C5G_Tests--efc28eab6a6d-hc-1305.log).
Let's try to make everything logged available in that case, so user can
debug what went wrong.
Change-Id: Ifc68e42022e8b2990d3c5221b3901f255e4e759b
---
M log_merge.sh
1 file changed, 15 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/40383/1
diff --git a/log_merge.sh b/log_merge.sh
index 65a3003..edc780c 100755
--- a/log_merge.sh
+++ b/log_merge.sh
@@ -51,16 +51,21 @@
TEST_CASES=$(ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq)
-for t in $TEST_CASES; do
- PREFIX="$BASE_NAME-$t"
- OUTPUT="$(get_new_prefix "$PREFIX").merged"
- if [ -e "$OUTPUT" ]; then
- >&2 echo "log_merge: ERROR: file already exists: $OUTPUT"
- exit 1
- fi
- ttcn3_logmerge $PREFIX-*.log > "$OUTPUT"
- echo "Generated $OUTPUT"
-done
+if [ -n "$TEST_CASES" ]; then
+ for t in $TEST_CASES; do
+ PREFIX="$BASE_NAME-$t"
+ OUTPUT="$(get_new_prefix "$PREFIX").merged"
+ if [ -e "$OUTPUT" ]; then
+ >&2 echo "log_merge: ERROR: file already exists: $OUTPUT"
+ exit 1
+ fi
+ ttcn3_logmerge $PREFIX-*.log > "$OUTPUT"
+ echo "Generated $OUTPUT"
+ done
+else
+ echo "Couldn't find test cases! Merging erverything"
+ ttcn3_logmerge $LOG_FILES > "$BASE_NAME.merged"
+fi
if [ "$2" = "--rm" ]; then
echo "Removing Input log files !!!"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40383?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifc68e42022e8b2990d3c5221b3901f255e4e759b
Gerrit-Change-Number: 40383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39848?usp=email )
Change subject: library/s1ap: split PDU specific API to S1AP_Functions.ttcn
......................................................................
Patch Set 4:
(1 comment)
File library/S1AP_Utils.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39848/comment/4c8a6637_296b… :
PS1, Line 1: module S1AP_Utils {
> Thank you, @osmith@sysmocom.de! I am wondering if we could maybe run `rmlinks. […]
since https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40032 running `rmlinks.sh` is not needed anymore. the build dir now gets deleted at the start of ttcn3 jenkins jobs, so this type of error should not happen anymore.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39848?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: Id3ba089140093490abd0307addeb5d7287dc5894
Gerrit-Change-Number: 39848
Gerrit-PatchSet: 4
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-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 27 May 2025 15:01:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email )
Change subject: testenv: use eclipse-titan 11 in Dockerfile
......................................................................
testenv: use eclipse-titan 11 in Dockerfile
Install eclipse-titan from osmocom:nightly instead of osmocom:latest,
which now has version 11. Once we ensured everything works as expected,
we will upgrade the version in osmocom:latest too.
Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437
---
M _testenv/data/podman/Dockerfile
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/40381/1
diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile
index 097fdc4..8b8432c 100644
--- a/_testenv/data/podman/Dockerfile
+++ b/_testenv/data/podman/Dockerfile
@@ -4,7 +4,7 @@
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org"
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/"
# Copy from common dir
COPY obs.key /obs.key
@@ -121,9 +121,9 @@
pip3 install ./osmo-python-tests --break-system-packages && \
rm -rf osmo-python-tests
-# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes
+# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes
RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \
- > /etc/apt/sources.list.d/osmocom-latest.list
+ > /etc/apt/sources.list.d/osmocom-nightly.list
ADD $OSMOCOM_REPO/Release /tmp/Release
RUN set -x && \
apt-get update && \
@@ -131,7 +131,7 @@
eclipse-titan \
&& \
apt-get clean && \
- rm /etc/apt/sources.list.d/osmocom-latest.list
+ rm /etc/apt/sources.list.d/osmocom-nightly.list
# Add mongodb for open5gs-hss. Using the package from bullseye since bookworm
# mongodb-org package is not available. Furthermore, manually install required
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437
Gerrit-Change-Number: 40381
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email )
Change subject: enft_kpi: retrieve per-eNB traffic counters
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I498d2854447a2d53d2abddd38652f3e2bbb1fbdd
Gerrit-Change-Number: 40281
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Tue, 27 May 2025 13:24:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No