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

[M] Change in osmo-ci[master]: jobs/ttcn3-testsuites: add -asan

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37177?usp=email ) Change subject: jobs/ttcn3-testsuites: add -asan ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37177?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: I08964335efd9276a147d58bf960ffdf535e3b51c Gerrit-Change-Number: 37177 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:43:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ci[master]: jobs: add osmocom-obs-nightly-asan

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37176?usp=email ) Change subject: jobs: add osmocom-obs-nightly-asan ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37176?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: I8fb6664702f85ee057377cb374394c8f24202474 Gerrit-Change-Number: 37176 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:42:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in docker-playground[master]: debian-bookworm-obs-asan: new container

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37178?usp=email ) Change subject: debian-bookworm-obs-asan: new container ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37178?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: I4219d927d4617232584d5401debd0be04df67ea0 Gerrit-Change-Number: 37178 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:41:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ci[master]: OBS: add --configure-append

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37173?usp=email ) Change subject: OBS: add --configure-append ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37173?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: I5ae396cc190559eb9c6a1671db374a91f03924e7 Gerrit-Change-Number: 37173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: add --disable-manuals

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37174?usp=email ) Change subject: OBS: add --disable-manuals ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37174?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: I3ff84f26ee6aa53cbcbe2275bedc6b724a461adc Gerrit-Change-Number: 37174 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ci[master]: OBS: improve argparse help output

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37171?usp=email ) Change subject: OBS: improve argparse help output ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37171?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: I09a8caa885b72b9d806fbfb4c8d72fe9667feec5 Gerrit-Change-Number: 37171 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:39:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: fix python 3.12 compat

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37170?usp=email ) Change subject: OBS: fix python 3.12 compat ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37170?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: I6430c2c4f75c8408d00305e1a1f0a64600eb086c Gerrit-Change-Number: 37170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jun 2024 14:37:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-ci[master]: OBS: get_git_version: debian/changelog as fallback

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37179?usp=email ) Change subject: OBS: get_git_version: debian/changelog as fallback ...................................................................... OBS: get_git_version: debian/changelog as fallback Fix osmocom-bb getting 0.1.0 as version: osmocom-bb: has no git tags, using 0.0.0 as version osmocom-bb: building source package 0.0.0.3621-d70e osmocom-bb: WARNING: version from changelog (0.1.0) is higher than version based on git tag (0.0.0.3621-d70e), using version from changelog (git tag not pushed yet?) With this patch: osmocom-bb: has no git tags osmocom-bb: getting version from debian/changelog osmocom-bb: building source package 0.1.0.3621-d70e osmocom-bb: adding debian/changelog entry (0.1.0 => 0.1.0.3621-d70e) Change-Id: I3a284b50ca62a2faff16702b7108ca391229caf1 --- M scripts/obs/lib/srcpkg.py 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/37179/1 diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 4da6b70..e24f25e 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -49,12 +49,18 @@ "HEAD"], cwd=repo_path, check=False) if result.returncode == 128: - print(f"{project}: has no git tags, using 0.0.0 as version") + print(f"{project}: has no git tags") commit = lib.run_cmd(["git", "rev-parse", "HEAD"], cwd=repo_path).output[0:4] count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"], cwd=repo_path).output.rstrip() - return f"0.0.0.{count}-{commit}" + try: + print(f"{project}: getting version from debian/changelog") + version = lib.debian.get_last_version_from_changelog(project) + return f"{version}.{count}-{commit}" + except: + print(f"{project}: using 0.0.0 as version") + return f"0.0.0.{count}-{commit}" if result.returncode != 0: lib.exit_error_cmd(result, "command failed unexpectedly") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37179?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: I3a284b50ca62a2faff16702b7108ca391229caf1 Gerrit-Change-Number: 37179 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in osmo-ci[master]: jobs: add osmocom-obs-nightly-asan

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/37176?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: jobs: add osmocom-obs-nightly-asan ...................................................................... jobs: add osmocom-obs-nightly-asan Add a new job that builds source packages for osmocom:nightly:asan, and uploads them there. It was considered whether we should instead of building a binary repository with asan packages in OBS, just build all packages and libraries from source at the jenkins builders. We decided against it, see the related discussion. Related: https://gerrit.osmocom.org/c/docker-playground/+/28902/1#message-30650d8450… Related: OS#5301 Change-Id: I8fb6664702f85ee057377cb374394c8f24202474 --- A jobs/osmocom-obs-nightly-asan.yml M scripts/obs/lib/config.py 2 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/37176/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37176?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: I8fb6664702f85ee057377cb374394c8f24202474 Gerrit-Change-Number: 37176 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in docker-playground[master]: debian-bookworm-obs-asan: new container

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37178?usp=email ) Change subject: debian-bookworm-obs-asan: new container ...................................................................... debian-bookworm-obs-asan: new container Copy debian-bookworm-obs-latest and configure it to use the osmocom:nightly:asan repository. Adjust jenkins-cmmon.sh for running the testusite against the asan repository. Related: OS#5301 Change-Id: I4219d927d4617232584d5401debd0be04df67ea0 --- A debian-bookworm-obs-asan/Dockerfile A debian-bookworm-obs-asan/Makefile M jenkins-common.sh 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/78/37178/1 diff --git a/debian-bookworm-obs-asan/Dockerfile b/debian-bookworm-obs-asan/Dockerfile new file mode 100644 index 0000000..4922723 --- /dev/null +++ b/debian-bookworm-obs-asan/Dockerfile @@ -0,0 +1,39 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +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:/asan/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-nightly-asan.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 nightly asan repository, add telnet for debugging +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + telnet \ + && \ + apt-get clean && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-nightly-asan.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly-asan.list + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/debian-bookworm-obs-asan/Makefile b/debian-bookworm-obs-asan/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-obs-asan/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile diff --git a/jenkins-common.sh b/jenkins-common.sh index eae0473..1caa5dd 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -21,6 +21,7 @@ osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; + osmo-*-asan) echo "debian-$DEBIAN_DEFAULT-obs-asan" ;; osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; @@ -78,6 +79,13 @@ # e.g. centos8-obs-2021q1 -> centos8-obs-latest echo "$1" | sed 's/20[0-9][0-9]q.*$/latest/' ;; + osmo-*-asan) + # Build Osmocom programs from the asan repository with the + # "-latest" docker containers (osmo-mgw-latest/Dockerfile etc.) + # so they are completely built from the OBS packages instead of + # building some of it from git (as in *-master/Dockerfile). + echo "$1" | sed 's/-asan/-latest/' + ;; *) echo "$1" ;; -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37178?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: I4219d927d4617232584d5401debd0be04df67ea0 Gerrit-Change-Number: 37178 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024