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

[XS] Change in osmo-ci[master]: OBS: build_binpkg: fix building for ubuntu 24.04

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40329?usp=email ) Change subject: OBS: build_binpkg: fix building for ubuntu 24.04 ...................................................................... OBS: build_binpkg: fix building for ubuntu 24.04 Delete the user with the given UID if it already exists, so the image can be built for ubuntu 24.04 too with UID=1000: > [3/6] RUN USERADD --uid=1000 -m user: 0.166 useradd: UID 1000 is not unique Change-Id: I85acbf2de53f02a65ef72d4fed8c2918ec6fa317 --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 5 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/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 0a96272..ba26a2d 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -6,7 +6,11 @@ COPY Release.key /usr/share/keyrings/osmocom.asc -RUN useradd --uid=${UID} -m user +RUN set -x && \ + if id "${UID}" >/dev/null 2>&1; then \ + userdel "$(getent passwd "${UID}" | cut -d: -f1)"; \ + fi && \ + useradd --uid=${UID} -m user # Only install build-essential here, and what's needed to add the Osmocom # repository. Everything else must be defined as dependency in the package -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40329?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: I85acbf2de53f02a65ef72d4fed8c2918ec6fa317 Gerrit-Change-Number: 40329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40330?usp=email ) Change subject: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan ...................................................................... OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan Fix that installing openjdk-21 as builddep of eclipse-titan fails with: Setting up openjdk-21-jre-headless:amd64 (21.0.7+6~us1-0ubuntu1~24.04) ... update-alternatives: using /usr/lib/jvm/java-21-openjdk-amd64/bin/java to provide /usr/bin/java (java) in auto mode update-alternatives: error: error creating symbolic link '/usr/share/man/man1/java.1.gz.dpkg-tmp': No such file or directory Change-Id: I0d3cf36e5f54616fc7b8629b4ad8eb63342ceb08 --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index ba26a2d..a86d48b 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -25,6 +25,7 @@ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ rm -rf /usr/share/man/ && \ + mkdir -p /usr/share/man/man1/ && \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40330?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: I0d3cf36e5f54616fc7b8629b4ad8eb63342ceb08 Gerrit-Change-Number: 40330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: OBS: gerrit_binpkgs: add FEED parameter

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40331?usp=email ) Change subject: OBS: gerrit_binpkgs: add FEED parameter ...................................................................... OBS: gerrit_binpkgs: add FEED parameter Allow switching to another feed easily. I'm using this to build packages for ubuntu quickly, for which we don't have a master feed (only for debian 10, 11, 12 currently). Change-Id: I1b04694e475a74b130ab3f801b99a0e827519ff8 --- M scripts/obs/gerrit_binpkgs.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/gerrit_binpkgs.sh b/scripts/obs/gerrit_binpkgs.sh index f199844..34f90c4 100755 --- a/scripts/obs/gerrit_binpkgs.sh +++ b/scripts/obs/gerrit_binpkgs.sh @@ -1,6 +1,7 @@ #!/bin/sh -e SCRIPTS_OBS_DIR="$(realpath "$(dirname "$0")")" DISTRO="$1" +FEED=${2:-master} error_exit() { echo "---" @@ -12,9 +13,13 @@ if [ -z "$DISTRO" ]; then - echo "usage: gerrit-binpkgs.sh DISTRO" + echo "usage: gerrit-binpkgs.sh DISTRO [FEED]" + echo + echo "FEED defaults to master." + echo echo "examples:" echo " gerrit-binpkgs.sh debian:12" + echo " gerrit-binpkgs.sh ubuntu:24.04 nightly" echo " gerrit-binpkgs.sh almalinux:8" exit 1 fi @@ -35,6 +40,8 @@ mkdir -p "$CACHE_DIR" rsync -a --delete "$GIT_REPO_DIR" "$CACHE_DIR" +# --feed must be master here, as for build_srcpkg it means that we take the +# currently checked out commit and add a commit_….txt file. echo ":: Building the source package" "$SCRIPTS_OBS_DIR"/build_srcpkg.py \ --allow-unknown-package \ @@ -48,6 +55,7 @@ echo ":: Building the binary packages" "$SCRIPTS_OBS_DIR"/build_binpkg.py \ --docker "$DISTRO" \ + --feed "$FEED" \ "$PROJECT_NAME" || error_exit echo ":: Find binary packages in: $SCRIPTS_OBS_DIR/_temp/binpkgs" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40331?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: I1b04694e475a74b130ab3f801b99a0e827519ff8 Gerrit-Change-Number: 40331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: OBS: gerrit_binpkgs: add FEED parameter

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40331?usp=email ) Change subject: OBS: gerrit_binpkgs: add FEED parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1b04694e475a74b130ab3f801b99a0e827519ff8 Gerrit-Change-Number: 40331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 13:17:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40330?usp=email ) Change subject: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0d3cf36e5f54616fc7b8629b4ad8eb63342ceb08 Gerrit-Change-Number: 40330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 13:17:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: fix building for ubuntu 24.04

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40329?usp=email ) Change subject: OBS: build_binpkg: fix building for ubuntu 24.04 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I85acbf2de53f02a65ef72d4fed8c2918ec6fa317 Gerrit-Change-Number: 40329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 13:17:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: OBS: gerrit_binpkgs: add FEED parameter

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40331?usp=email ) Change subject: OBS: gerrit_binpkgs: add FEED parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1b04694e475a74b130ab3f801b99a0e827519ff8 Gerrit-Change-Number: 40331 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 12:47:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40330?usp=email ) Change subject: OBS: build_binpkg: ubuntu 24.04: fix eclipse-titan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0d3cf36e5f54616fc7b8629b4ad8eb63342ceb08 Gerrit-Change-Number: 40330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 12:47:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: fix building for ubuntu 24.04

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40329?usp=email ) Change subject: OBS: build_binpkg: fix building for ubuntu 24.04 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I85acbf2de53f02a65ef72d4fed8c2918ec6fa317 Gerrit-Change-Number: 40329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 May 2025 12:47:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40322?usp=email ) Change subject: stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s ...................................................................... stp: STP_Tests_IPA: Support configuring less than 8 AS(P)s This is a preparation patch towards splitting testsuite into smaller configurations. Change-Id: I820d295cd22fe824abf0f60bf6f1f0f3fd069d85 --- M stp/STP_Tests_IPA.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index b7da439..3e484cb 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -34,7 +34,7 @@ import from STP_Tests_Common all; -private const integer NR_IPA := 8; +private const integer MAX_NR_IPA := 8; type record of charstring AspNameArray; @@ -57,10 +57,10 @@ type component IPA_CT extends Test_CT { /* for IPA we use the IPA_Emulation and not directly IPA_CodecPort to avoid * having to re-invent IPA CCM handling here */ - port MTP3asp_PT IPA[NR_IPA]; - port IPA_SP_PT IPA_CTRL[NR_IPA]; - var IPA_Emulation_CT vc_IPA[NR_IPA]; - var IPA_CCM_Parameters g_ccm_pars[NR_IPA]; + port MTP3asp_PT IPA[MAX_NR_IPA]; + port IPA_SP_PT IPA_CTRL[MAX_NR_IPA]; + var IPA_Emulation_CT vc_IPA[MAX_NR_IPA]; + var IPA_CCM_Parameters g_ccm_pars[MAX_NR_IPA]; } friend function f_IPA_send(integer idx, octetstring data) runs on IPA_CT { @@ -102,7 +102,7 @@ f_init_common(); - for (i := 0; i < NR_IPA; i:=i+1) { + for (i := 0; i < lengthof(mp_ipa_as_names); i:=i+1) { vc_IPA[i] := IPA_Emulation_CT.create("IPA" & int2str(i)); map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT); connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT); @@ -116,7 +116,7 @@ var integer port_offset := 0; if (use_unknown_asp_port) { /* Add 100 to the port since we know that port is not configured in any - ASP only up to NR_IPA are configured. */ + ASP only up to MAX_NR_IPA are configured. */ port_offset := 100; } vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, mp_stp_ipa_port, mp_local_ipa_ip, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40322?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: I820d295cd22fe824abf0f60bf6f1f0f3fd069d85 Gerrit-Change-Number: 40322 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025