October 2025 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-abis[master]: trau: add TW-TS-007 compression and decompression functions
by falconia 08 Oct '25

08 Oct '25

falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41162?usp=email ) Change subject: trau: add TW-TS-007 compression and decompression functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I10a86f5e4a7323cf06fb1d2624757c34bd23218f Gerrit-Change-Number: 41162 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 14:12:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau: add TW-TS-007 packing and unpacking functions
by falconia 08 Oct '25

08 Oct '25

falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41161?usp=email ) Change subject: trau: add TW-TS-007 packing and unpacking functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie81280d2b90f69fbdde9fa968f747a35ea123f79 Gerrit-Change-Number: 41161 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 14:12:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: Makefile: ctags: include *.cc/*.hh files
by fixeria 08 Oct '25

08 Oct '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41207?usp=email ) Change subject: Makefile: ctags: include *.cc/*.hh files ...................................................................... Makefile: ctags: include *.cc/*.hh files Also generate tags for *.cc/*.hh files. In order to avoid generating tags for generated source files, limit the search scope for `find`. Change-Id: Iab28b36ea6bb6ece45d1834dfc04be489da39ea2 --- M Makefile 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/Makefile b/Makefile index cbf421f..d7f8b7d 100644 --- a/Makefile +++ b/Makefile @@ -139,7 +139,9 @@ .PHONY: tags regen-diameter-types-ttcn clean tags: - find $(shell pwd) \ + find deps library $(SUBDIRS) \ + -type f -name "*.cc" -o \ + -type f -name "*.hh" -o \ -type f -name "*.ttcn" -o \ -type f -name "*.ttcnpp" | \ xargs ctags -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41207?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: Iab28b36ea6bb6ece45d1834dfc04be489da39ea2 Gerrit-Change-Number: 41207 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: add a --fast argument
by osmith 08 Oct '25

08 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?usp=email ) Change subject: testenv: add a --fast argument ...................................................................... testenv: add a --fast argument The ttcn3-{tcpdump,dumpcap}-*.sh scripts can easily spend 5s or more for each test with: * Waiting until the pcap gets created. * Waiting until pcap size does not increase anymore after the test. * Saving the talloc report. Add --fast to skip all this, to allow running a whole testsuite significantly faster locally to check for regressions. Developers can then still run failing tests again without --fast to get the pcap and talloc reports. Change-Id: Ief3488293e5c5c1a1c98244f80ffd56eadb040c5 --- M _testenv/testenv/__init__.py M _testenv/testenv/testsuite.py M ttcn3-dumpcap-start.sh M ttcn3-dumpcap-stop.sh M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 6 files changed, 35 insertions(+), 12 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index c9e63b4..44259c2 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -112,6 +112,12 @@ "--titan-version", help="which eclipse-titan version to use", ) + group.add_argument( + "-f", + "--fast", + action="store_true", + help="skip recording pcaps (+ sleep before/after) and talloc reports", + ) group = sub_run.add_argument_group("source/binary options", "All components are built from source by default.") group.add_argument( diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 0007c57..97a340e 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -151,6 +151,9 @@ env["OSMO_SUT_HOST"] = host env["OSMO_SUT_PORT"] = port + if testenv.args.fast: + env["TESTENV_FAST"] = "1" + env = testenv.cmd.generate_env(env, testenv.args.podman) cmd = [start_testsuite, suite, section_data["config"]] diff --git a/ttcn3-dumpcap-start.sh b/ttcn3-dumpcap-start.sh index 4bdd3ec..d0b31ad 100755 --- a/ttcn3-dumpcap-start.sh +++ b/ttcn3-dumpcap-start.sh @@ -18,6 +18,10 @@ echo "------ $TESTCASE ------" date +if [ "$TESTENV_FAST" = 1 ]; then + exit 0 +fi + if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp/pcap mkdir -p "$TTCN3_PCAP_PATH" diff --git a/ttcn3-dumpcap-stop.sh b/ttcn3-dumpcap-stop.sh index 1ac8e7b..8c5d347 100755 --- a/ttcn3-dumpcap-stop.sh +++ b/ttcn3-dumpcap-stop.sh @@ -15,6 +15,10 @@ printf "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m\n\n" fi +if [ "$TESTENV_FAST" = 1 ]; then + exit 0 +fi + if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp fi diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 4b5244c..d193b1d 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -11,7 +11,14 @@ GSMTAP_PORT=4729 TESTCASE=$1 +echo "$TESTCASE" > "$TTCN3_PCAP_PATH/.current_test" +echo "------ $TESTCASE ------" +date + +if [ "$TESTENV_FAST" = 1 ]; then + exit 0 +fi SUDOSTR="" if ! [ "$(id -u)" = "0" ]; then @@ -20,9 +27,6 @@ # and this script will hang indefinitely fi -echo "------ $TESTCASE ------" -date - if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp/pcap mkdir -p "$TTCN3_PCAP_PATH" @@ -112,5 +116,3 @@ fi done kill $PID - -echo "$TESTCASE" > "$TTCN3_PCAP_PATH/.current_test" diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 65aeb2a..41d29ec 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -8,13 +8,6 @@ TESTCASE=$1 VERDICT="$2" -SUDOSTR="" -if ! [ "$(id -u)" = "0" ]; then - SUDOSTR="sudo -n" - # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, - # and this script will hang indefinitely -fi - date if [ x"$VERDICT" = x"pass" ]; then @@ -23,6 +16,17 @@ printf "\033[1;31m------ $TESTCASE $VERDICT ------\033[0m\n\n" fi +if [ "$TESTENV_FAST" = 1 ]; then + exit 0 +fi + +SUDOSTR="" +if ! [ "$(id -u)" = "0" ]; then + SUDOSTR="sudo -n" + # Otherwise, if sudo /usr/bin/kill, sudo /usr/bin/tcpdump cannot be run without a password prompt, + # and this script will hang indefinitely +fi + if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?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: Ief3488293e5c5c1a1c98244f80ffd56eadb040c5 Gerrit-Change-Number: 41206 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: add a --fast argument
by osmith 08 Oct '25

08 Oct '25

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?usp=email ) Change subject: testenv: add a --fast argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?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: Ief3488293e5c5c1a1c98244f80ffd56eadb040c5 Gerrit-Change-Number: 41206 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:41:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: Makefile: ctags: include *.cc/*.hh files
by osmith 08 Oct '25

08 Oct '25

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41207?usp=email ) Change subject: Makefile: ctags: include *.cc/*.hh files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41207?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: Iab28b36ea6bb6ece45d1834dfc04be489da39ea2 Gerrit-Change-Number: 41207 Gerrit-PatchSet: 1 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:41:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: scripts/osmo-ci-docker-rebuild: switch to trixie
by osmith 08 Oct '25

08 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41201?usp=email ) Change subject: scripts/osmo-ci-docker-rebuild: switch to trixie ...................................................................... scripts/osmo-ci-docker-rebuild: switch to trixie Depends: docker-playground I1c0efb85324b70b6370ea94f74f440e639442da5 Change-Id: I1497f14e57f9d7b0867368b923c8f8919c72cd76 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 1cc1165..d901826 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,16 +5,21 @@ case "$(arch)" in x86_64) + # OS#6859: still need bookworm for osmo-opencm3-projects docker_images_require \ "debian-bookworm-build" \ - "debian-bookworm-erlang" + "debian-bookworm-erlang" \ + "debian-trixie-build" ;; arm*|aarch64) # OS#6627: need to run a separate "docker pull" command with platform + # OS#6858: still need bookworm for osmo-pcu docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7" + docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7" export NO_DOCKER_IMAGE_PULL=1 docker_images_require \ - "debian-bookworm-build-arm" + "debian-bookworm-build-arm" \ + "debian-trixie-build-arm" ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41201?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: I1497f14e57f9d7b0867368b923c8f8919c72cd76 Gerrit-Change-Number: 41201 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

1 0

[S] Change in osmo-ci[master]: jobs/gerrit,master: use debian-trixie-build
by osmith 08 Oct '25

08 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41202?usp=email ) Change subject: jobs/gerrit,master: use debian-trixie-build ...................................................................... jobs/gerrit,master: use debian-trixie-build Change-Id: Id65b7f9045e13bed38c1de514cdd537fac88f60f --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: 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 614abde..72d75bc 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -95,7 +95,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-bookworm-build' + docker_img: '$USER/debian-trixie-build' docker_img_erlang: '$USER/debian-bookworm-erlang' docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' @@ -338,7 +338,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$DOCKER_IMG-arm" + DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 SETARCH_CMD="setarch linux32" ;; esac @@ -445,7 +445,8 @@ - simtrace2 - osmo-opencm3-projects: - cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' + # bookworm: OS#6859 + cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: "" - osmo-asf4-dfu: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fec014e..43ae3e8 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -78,7 +78,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-bookworm-build' + docker_img: '$USER/debian-trixie-build' docker_img_erlang: '$USER/debian-bookworm-erlang' docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' @@ -454,7 +454,7 @@ DOCKER_IMG="{docker_img}" case "$(arch)" in arm*|aarch64) - DOCKER_IMG="$DOCKER_IMG-arm" + DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858 SETARCH_CMD="setarch linux32" ;; esac @@ -574,7 +574,8 @@ - docs_ftp.osmocom.org - osmo-opencm3-projects: repos_url: '{gitea_url}/electronics/{repos}' - cmd: '{docker_run} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh --publish' + # bookworm: OS#6859 + cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de ssh: - binaries_ftp.osmocom.org -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41202?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: Id65b7f9045e13bed38c1de514cdd537fac88f60f Gerrit-Change-Number: 41202 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

1 0

[M] Change in docker-playground[master]: debian-trixie-build-arm: new container
by osmith 08 Oct '25

08 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/41199?usp=email ) Change subject: debian-trixie-build-arm: new container ...................................................................... debian-trixie-build-arm: new container Change-Id: I1c0efb85324b70b6370ea94f74f440e639442da5 --- A debian-trixie-build-arm/Dockerfile A debian-trixie-build-arm/Makefile 2 files changed, 94 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian-trixie-build-arm/Dockerfile b/debian-trixie-build-arm/Dockerfile new file mode 100644 index 0000000..cd462c3 --- /dev/null +++ b/debian-trixie-build-arm/Dockerfile @@ -0,0 +1,91 @@ +# Image used to run contrib/jenkins.sh scripts of a few Osmocom projects on +# arm. Keep this image minimal so the rpis don't need forever to build it. +# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git. +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:trixie +FROM ${REGISTRY}/arm32v7/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG UID + +# Copy from common dir +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libbladerf-dev \ + libboost-dev \ + libboost-filesystem-dev \ + libboost-program-options-dev \ + libboost-thread-dev \ + libfftw3-dev \ + libgnutls28-dev \ + liblimesuite-dev \ + libmnl-dev \ + libortp-dev \ + libpcsclite-dev \ + libsctp-dev \ + libtalloc-dev \ + libtool \ + libuhd-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + make \ + pkg-config \ + python3-minimal \ + python3-setuptools \ + stow \ + && \ + apt-get clean + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Install osmo-ci.git/scripts to /usr/local/bin +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install packages from Osmocom OBS nightly repository +# * osmo-trx: sdcc (OS#6748) +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + -t'o=obs://osmocom/osmocom:nightly/Debian_13,n=Debian_13,l=osmocom:nightly,c=' \ + sdcc \ + && \ + apt-get clean diff --git a/debian-trixie-build-arm/Makefile b/debian-trixie-build-arm/Makefile new file mode 100644 index 0000000..bbbc0f3 --- /dev/null +++ b/debian-trixie-build-arm/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:trixie +DISTRO=debian-trixie +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41199?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: I1c0efb85324b70b6370ea94f74f440e639442da5 Gerrit-Change-Number: 41199 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

1 0

[M] Change in docker-playground[master]: debian-trixie-build: new container
by osmith 08 Oct '25

08 Oct '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/41198?usp=email ) Change subject: debian-trixie-build: new container ...................................................................... debian-trixie-build: new container Create a copy of debian-bookworm-build for trixie. Change-Id: I880b5d9c57642af98c116fcb4137a54c58f5f7b4 --- A debian-trixie-build/Dockerfile A debian-trixie-build/Makefile M jenkins-common.sh 3 files changed, 240 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile new file mode 100644 index 0000000..7f82fe5 --- /dev/null +++ b/debian-trixie-build/Dockerfile @@ -0,0 +1,234 @@ +# Image for building all Osmocom projects in master/gerrit/ttcn3 jenkins jobs +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:trixie +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG UID +ARG LLVM_VERSION="14.0.0" + +# Copy from common dir +COPY .common/respawn.sh /usr/local/bin/respawn.sh +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install LLVM-embedded-toolchain-for-Arm +# This binary is built against libtinfo5, which isn't in trixie so use the +# bookworm version for it. +RUN if [ "$(arch)" != "x86_64" ]; then \ + echo "ERROR: use debian-trixie-build-arm instead"; \ + exit 1; \ + fi && \ + set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + wget \ + && \ + apt-get clean && \ + wget -q http://ftp.de.debian.org/debian/pool/main/n/ncurses/libtinfo5_6.4-4_amd64.d… && \ + dpkg -i "libtinfo5_6.4-4_amd64.deb" && \ + rm "libtinfo5_6.4-4_amd64.deb" && \ + wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/do… && \ + tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \ + /opt/llvm-arm/bin/clang --version && \ + /opt/llvm-arm/bin/clang --print-targets + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + asciidoc \ + asciidoc-dblatex \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bc \ + bison \ + build-essential \ + bzip2 \ + ca-certificates \ + ccache \ + clang-format \ + cmake \ + coccinelle \ + cppcheck \ + curl \ + dahdi-source \ + dblatex \ + dbus \ + debhelper \ + devscripts \ + dh-autoreconf \ + docbook5-xml \ + doxygen \ + equivs \ + flex \ + g++ \ + gawk \ + gcc \ + gcc-arm-none-eabi \ + gdb \ + ghostscript \ + git \ + gnupg \ + graphviz \ + htop \ + iproute2 \ + latexmk \ + lcov \ + libaio-dev \ + libasound2-dev \ + libbladerf-dev \ + libboost-all-dev \ + libc-ares-dev \ + libcdk5-dev \ + libcsv-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libelf-dev \ + libffi-dev \ + libfftw3-dev \ + libgmp-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + libidn-dev \ + libjansson-dev \ + liblimesuite-dev \ + liblua5.3-dev \ + libmnl-dev \ + libmongoc-dev \ + libncurses5-dev \ + libnewlib-arm-none-eabi \ + libnftables-dev \ + libnftnl-dev \ + libnghttp2-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + liboping-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + librsvg2-bin \ + libsctp-dev \ + libsigsegv-dev \ + libsnmp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtinfo5 \ + libtool \ + libuhd-dev \ + libulfius-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusb-dev \ + libxml2-utils \ + libyaml-dev \ + libzmq3-dev \ + locales \ + lua-socket \ + make \ + meson \ + mscgen \ + ofono \ + openssh-client \ + patchelf \ + picolibc-arm-none-eabi \ + pkg-config \ + pylint \ + python3 \ + python3-gi \ + python3-mako \ + python3-nwdiag \ + python3-pip \ + python3-pyflakes \ + python3-pytest \ + python3-setuptools \ + python3-usb \ + python3-yaml \ + rsync \ + source-highlight \ + sqlite3 \ + stow \ + sudo \ + swig \ + systemd \ + tcpdump \ + telnet \ + tex-gyre \ + texinfo \ + unzip \ + virtualenv \ + xsltproc \ + xxd \ + && \ + apt-get clean + +# Install pip dependencies (alphabetic order) +# break-system-packages: inside docker it's fine to install pkgs system-wide +# lcov-to-cobertura-xml: use this commit as the latest version fails: +# https://github.com/eriwen/lcov-to-cobertura-xml/issues/63 +ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt +RUN set -x && \ + cat /tmp/pysim_requirements.txt && \ + pip3 install --break-system-packages \ + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git@028da3798355d0260c6…' \ + 'git+https://github.com/osmocom/sphinx-argparse@inside-classes#egg=sphinx-ar…' \ + 'git+https://github.com/podshumok/python-smpplib.git' \ + 'ruff' \ + 'sphinx' \ + 'sphinxcontrib-napoleon' \ + -r /tmp/pysim_requirements.txt + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Install osmo-ci.git/scripts to /usr/local/bin +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit +RUN git -C /opt clone --depth=1 https://gerrit.osmocom.org/osmo-gsm-manuals + +# Install packages from Osmocom OBS nightly repository +# * osmo-trx: sdcc (OS#6748) +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + -t'o=obs://osmocom/osmocom:nightly/Debian_13,n=Debian_13,l=osmocom:nightly,c=' \ + sdcc \ + && \ + apt-get clean diff --git a/debian-trixie-build/Makefile b/debian-trixie-build/Makefile new file mode 100644 index 0000000..bbbc0f3 --- /dev/null +++ b/debian-trixie-build/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:trixie +DISTRO=debian-trixie +include ../make/Makefile diff --git a/jenkins-common.sh b/jenkins-common.sh index 31ad497..57d2190 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -46,6 +46,7 @@ debian-buster-*) echo "debian-buster" ;; debian-bullseye-*) echo "debian-bullseye" ;; debian-bookworm-*) echo "debian-bookworm" ;; + debian-trixie-*) echo "debian-trixie" ;; *) echo "debian-$DEBIAN_DEFAULT" ;; esac } @@ -61,10 +62,12 @@ debian10-*) echo "debian/eol:buster" ;; debian11-*) echo "debian:bullseye" ;; debian12-*) echo "debian:bookworm" ;; + debian13-*) echo "debian:trixie" ;; debian-stretch-*) echo "debian/eol:stretch" ;; debian-buster-*) echo "debian/eol:buster" ;; debian-bullseye-*) echo "debian:bullseye" ;; debian-bookworm-*) echo "debian:bookworm" ;; + debian-trixie-*) echo "debian:trixie" ;; *) echo "debian:$DEBIAN_DEFAULT" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41198?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: I880b5d9c57642af98c116fcb4137a54c58f5f7b4 Gerrit-Change-Number: 41198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 0