April 2024 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: debian-bookworm-obs-latest: add build user

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email ) Change subject: debian-bookworm-obs-latest: add build user ...................................................................... debian-bookworm-obs-latest: add build user Copy the block for configuring the build user and disabling man pages from debian-bookworm-build. This fixes failures on ttcn3-ggsn-test-kernel-latest* (non-latest worked fine since these use containers based on debian-bookworm-build). Fixes: 5a48bfbe ("scripts/kernel-test: build initrd+kernel as user") Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0 --- M debian-bookworm-obs-latest/Dockerfile 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian-bookworm-obs-latest/Dockerfile b/debian-bookworm-obs-latest/Dockerfile index cd44fcc..9451902 100644 --- a/debian-bookworm-obs-latest/Dockerfile +++ b/debian-bookworm-obs-latest/Dockerfile @@ -6,11 +6,24 @@ ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_12/" +ARG UID # Copy from common dir COPY .common/respawn.sh /usr/local/bin/respawn.sh COPY .common/Release.key /usr/share/keyrings/osmocom-latest.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} build && \ + mkdir /build && \ + chown -R build:build /build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + # Configure Osmocom latest repository, add telnet for debugging RUN set -x && \ apt-get update && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0 Gerrit-Change-Number: 36530 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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: {open5gs,osmo-uecups}-latest: don't hardcode UID

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email ) Change subject: {open5gs,osmo-uecups}-latest: don't hardcode UID ...................................................................... {open5gs,osmo-uecups}-latest: don't hardcode UID Adjust open5gs-latest and osmo-uecups-latest to not hardcode a UID. This is in preparation for creating a "build" user in debian-bookworm-obs-latest, like we have it in debian-bookworm-build. Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd --- M open5gs-latest/Dockerfile M osmo-uecups-latest/Dockerfile 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index c395d9c..46375e7 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -53,6 +53,6 @@ # create a user ARG username=osmocom -RUN useradd -m --uid=1000 ${username} && \ +RUN useradd -m ${username} && \ echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ chmod 0440 /etc/sudoers.d/${username} diff --git a/osmo-uecups-latest/Dockerfile b/osmo-uecups-latest/Dockerfile index 9546720..1e0d68b 100644 --- a/osmo-uecups-latest/Dockerfile +++ b/osmo-uecups-latest/Dockerfile @@ -25,7 +25,7 @@ COPY osmo-uecups-daemon.cfg /data/osmo-uecups-daemon.cfg -RUN useradd -m --uid=1000 osmocom +RUN useradd -m osmocom WORKDIR /data CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-uecups-daemon -c /data/osmo-uecups-daemon.cfg >/data/osmo-uecups-daemon.log 2>&1"] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd Gerrit-Change-Number: 36529 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: {open5gs,osmo-uecups}-latest: don't hardcode UID

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email ) Change subject: {open5gs,osmo-uecups}-latest: don't hardcode UID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd Gerrit-Change-Number: 36529 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Apr 2024 14:14:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: {open5gs,osmo-uecups}-latest: don't hardcode UID

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email ) Change subject: {open5gs,osmo-uecups}-latest: don't hardcode UID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd Gerrit-Change-Number: 36529 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Apr 2024 13:40:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-obs-latest: add build user

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email ) Change subject: debian-bookworm-obs-latest: add build user ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0 Gerrit-Change-Number: 36530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Apr 2024 13:39:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: {open5gs,osmo-uecups}-latest: don't hardcode UID

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email ) Change subject: {open5gs,osmo-uecups}-latest: don't hardcode UID ...................................................................... {open5gs,osmo-uecups}-latest: don't hardcode UID Adjust open5gs-latest and osmo-uecups-latest to not hardcode a UID. This is in preparation for creating a "build" user in debian-bookworm-obs-latest, like we have it in debian-bookworm-build. Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd --- M open5gs-latest/Dockerfile M osmo-uecups-latest/Dockerfile 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/36529/1 diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index c395d9c..46375e7 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -53,6 +53,6 @@ # create a user ARG username=osmocom -RUN useradd -m --uid=1000 ${username} && \ +RUN useradd -m ${username} && \ echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ chmod 0440 /etc/sudoers.d/${username} diff --git a/osmo-uecups-latest/Dockerfile b/osmo-uecups-latest/Dockerfile index 9546720..1e0d68b 100644 --- a/osmo-uecups-latest/Dockerfile +++ b/osmo-uecups-latest/Dockerfile @@ -25,7 +25,7 @@ COPY osmo-uecups-daemon.cfg /data/osmo-uecups-daemon.cfg -RUN useradd -m --uid=1000 osmocom +RUN useradd -m osmocom WORKDIR /data CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-uecups-daemon -c /data/osmo-uecups-daemon.cfg >/data/osmo-uecups-daemon.log 2>&1"] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icaebf46487056cea745805527fdc545d9a1846cd Gerrit-Change-Number: 36529 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-obs-latest: add build user

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email ) Change subject: debian-bookworm-obs-latest: add build user ...................................................................... debian-bookworm-obs-latest: add build user Copy the block for configuring the build user and disabling man pages from debian-bookworm-build. This fixes failures on ttcn3-ggsn-test-kernel-latest* (non-latest worked fine since these use containers based on debian-bookworm-build). Fixes: 5a48bfbe ("scripts/kernel-test: build initrd+kernel as user") Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0 --- M debian-bookworm-obs-latest/Dockerfile 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/36530/1 diff --git a/debian-bookworm-obs-latest/Dockerfile b/debian-bookworm-obs-latest/Dockerfile index cd44fcc..9451902 100644 --- a/debian-bookworm-obs-latest/Dockerfile +++ b/debian-bookworm-obs-latest/Dockerfile @@ -6,11 +6,24 @@ ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_12/" +ARG UID # Copy from common dir COPY .common/respawn.sh /usr/local/bin/respawn.sh COPY .common/Release.key /usr/share/keyrings/osmocom-latest.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} build && \ + mkdir /build && \ + chown -R build:build /build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + # Configure Osmocom latest repository, add telnet for debugging RUN set -x && \ apt-get update && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0 Gerrit-Change-Number: 36530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit,master: osmo-hnbgw: add nftables var

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email ) Change subject: jobs/gerrit,master: osmo-hnbgw: add nftables var ...................................................................... jobs/gerrit,master: osmo-hnbgw: add nftables var Build with and without nftables. Related: OS#6425 Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 22 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3be106d..607e909 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -383,13 +383,16 @@ a1: !!python/tuple ["1", "0"] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] + a3_name: NFTABLES + a3: !!python/tuple ["1", "0"] combination_filter: > - (PFCP == "1" && WITH_MANUALS == "1") || - (PFCP == "0" && WITH_MANUALS == "0") + (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || + (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-upf: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 66043e5..a902be8 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -503,13 +503,16 @@ a1: !!python/tuple ["1", "0"] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] + a3_name: NFTABLES + a3: !!python/tuple ["1", "0"] combination_filter: > - (PFCP == "1" && WITH_MANUALS == "1") || - (PFCP == "0" && WITH_MANUALS == "0") + (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || + (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - rtl-sdr: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c Gerrit-Change-Number: 36528 Gerrit-PatchSet: 2 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: add libnftnl-dev

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email ) Change subject: debian-bookworm-build: add libnftnl-dev ...................................................................... debian-bookworm-build: add libnftnl-dev For osmo-hnbgw, osmo-upf. Related: OS#6425 Change-Id: I5fdaa634d12bc6c8643c130a43d30e840890d572 --- M debian-bookworm-build/Dockerfile 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index 4f8a142..d847bf1 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -110,6 +110,7 @@ libncurses5-dev \ libnewlib-arm-none-eabi \ libnftables-dev \ + libnftnl-dev \ libnl-3-dev \ libnl-route-3-dev \ liboping-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5fdaa634d12bc6c8643c130a43d30e840890d572 Gerrit-Change-Number: 36527 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: add libnftnl-dev

by laforge

Attention is currently required from: fixeria, neels, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email ) Change subject: debian-bookworm-build: add libnftnl-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5fdaa634d12bc6c8643c130a43d30e840890d572 Gerrit-Change-Number: 36527 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Apr 2024 11:44:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024