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

[S] Change in osmo-trx[osmith/1.6.2]: doc/examples: fix missing config files in release tarballs

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 36715 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: Wed, 08 May 2024 11:06:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-trx[osmith/1.6.2]: osmo-trx-uhd: Make sure HOME environment variable is set

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36714?usp=email ) Change subject: osmo-trx-uhd: Make sure HOME environment variable is set ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10 Gerrit-Change-Number: 36714 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-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 11:05:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in libosmocore[master]: {fsm,vty}: add a VTY command to generate FSM state graphs

by pespin

Attention is currently required from: fixeria, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36713?usp=email ) Change subject: {fsm,vty}: add a VTY command to generate FSM state graphs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/vty/fsm_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/36713/comment/114d11df_7e59d7af PS1, Line 196: return CMD_SUCCESS; As an improvement, you could also maybe make a box for each event type, and then have an arrow from the event box to each state box, using another color and/or arrow style (eg dashed). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36713?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09ee0a8c3fc4b1aa991ab5c93c0b654fccd7ea4c Gerrit-Change-Number: 36713 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 11:04:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-sip-connector[master]: .deb/.rpm: various fixes related to non-root

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/36664?usp=email ) Change subject: .deb/.rpm: various fixes related to non-root ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/36664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ib129217f6aff713d1d0e7aa831b4b54823e9bade Gerrit-Change-Number: 36664 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: Wed, 08 May 2024 11:00:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36719?usp=email ) Change subject: Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1 ...................................................................... Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1 Change-Id: I1ac53635deea82a501f2a8c7a94faf501ddf7afd --- M library/Misc_Helpers.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/36719/1 diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index fd2e7bb..805254a 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -94,7 +94,7 @@ if (delim_pos > pos) { parts := parts & { substr(str, pos, delim_pos - pos) }; } - pos := delim_pos + 1; + pos := delim_pos + lengthof(delim); } return parts; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ac53635deea82a501f2a8c7a94faf501ddf7afd Gerrit-Change-Number: 36719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-ci[master]: jobs: gerrit: build osmo-pcap + dep for centos7

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36718?usp=email ) Change subject: jobs: gerrit: build osmo-pcap + dep for centos7 ...................................................................... jobs: gerrit: build osmo-pcap + dep for centos7 We are about to remove the rpm spec files for almost all Osmocom git repositories. The only two git repositories where we still need them, because we have a customer using them on centos 7, are libosmocore and osmo-pcap (SYS#6760). Add CI to ensure that these still build fine, and that we don't remove these by mistake. Related: OS#6446 Change-Id: I4d4a67c053ed29811c504158d1ef49430880ad4f --- M jobs/gerrit-verifications.yml M scripts/obs/build_binpkg.py M scripts/obs/data/build_binpkg.Dockerfile M scripts/obs/data/build_rpm.sh M scripts/obs/lib/config.py 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/36718/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 607e909..1a5d656 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -121,6 +121,7 @@ a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' + pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 - libsmpp34 @@ -258,7 +259,8 @@ -e WITH_MANUALS="$WITH_MANUALS" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - - osmo-pcap + - osmo-pcap: + pipeline_binpkgs: "centos:7 debian:10 debian:12" # centos7: SYS#6760 - osmo-pcu: slave_axis: !!python/tuple [osmocom-gerrit, rpi4-raspbian11] diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index ae2fe53..5c8cd01 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -69,6 +69,7 @@ env = {"JOBS": str(args.jobs), "PACKAGE": args.package, "BUILDUSER": os.environ["USER"], + "DISTRO": args.docker, "PACKAGEFORMAT": "deb"} docker_args = [] diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 55bfe0c..b29d8f9 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -51,6 +51,24 @@ yum config-manager --set-enabled powertools && \ su user -c rpmdev-setuptree \ ;; \ + centos:7) \ + yum -y install \ + autoconf \ + automake \ + binutils \ + dnf-utils \ + gcc \ + gcc-c++ \ + glibc-devel \ + iproute \ + libtool \ + make \ + redhat-rpm-config \ + rpm-build \ + rpmdevtools \ + wget && \ + su user -c rpmdev-setuptree \ + ;; \ esac # Add master repository, where packages immediately get updated after merging @@ -71,7 +89,7 @@ echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/xUbuntu_$VERSION/ ./" \ > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ - almalinux:*) \ + almalinux:*|centos:*) \ { echo "[network_osmocom_$FEED]"; \ echo "name=osmocom:$FEED"; \ echo "type=rpm-md"; \ diff --git a/scripts/obs/data/build_rpm.sh b/scripts/obs/data/build_rpm.sh index a73d164..7247999 100755 --- a/scripts/obs/data/build_rpm.sh +++ b/scripts/obs/data/build_rpm.sh @@ -22,7 +22,23 @@ su "$BUILDUSER" -c "cp /obs/data/rpmmacros ~/.rpmmacros" # Force refresh of package index data (OS#6038) -dnf makecache --refresh +if command -v dnf; then + dnf makecache --refresh +else + yum clean expire-cache +fi + +case "$DISTRO" in + centos:7) + # HACK: remove pkg-config as centos7 has pkgconfig instead + # (which will get pulled in automatically). This could be + # solved more elegantly, but we only build very few centos7 + # packages, so let's not spend too much time on this. In OBS + # this is handled in the centos7 prjconf: + # https://build.opensuse.org/projects/CentOS:CentOS-7/prjconf + sed -i '/^BuildRequires:.*pkg-config/d' "/home/$BUILDUSER/rpmbuild/SPECS/$spec" + ;; +esac $yum_builddep "/home/$BUILDUSER/rpmbuild/SPECS/$spec" diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index b4e23a0..82bf188 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -122,6 +122,7 @@ docker_distro_default = "debian:12" docker_distro_other = [ "almalinux:*", # instead of centos (SYS#5818) + "centos:7", # SYS#6760 "debian:*", "ubuntu:*", ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36718?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: I4d4a67c053ed29811c504158d1ef49430880ad4f Gerrit-Change-Number: 36718 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: remove AlmaLinux:8

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/36717?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: OBS: sync_obs_projects: remove AlmaLinux:8 ...................................................................... OBS: sync_obs_projects: remove AlmaLinux:8 Related: OS#6446 Change-Id: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 --- M jobs/osmocom-obs-sync.yml 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/36717/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36717?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: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 Gerrit-Change-Number: 36717 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: remove AlmaLinux:8

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36717?usp=email ) Change subject: OBS: sync_obs_projects: remove AlmaLinux:8 ...................................................................... OBS: sync_obs_projects: remove AlmaLinux:8 Related: OS#6446 Change-Id: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 --- M jobs/osmocom-obs-sync.yml M scripts/obs/sync_obs_projects.py 2 files changed, 10 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/36717/1 diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index a57f968..3776688 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -28,7 +28,6 @@ - shell: | export PYTHONUNBUFFERED=1 export DISTROS=" - AlmaLinux:8 Debian:10 Debian:11 Debian:12 diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index cc4635a..965aca2 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -124,8 +124,6 @@ def get_relevant_arches(project): - if project.startswith("AlmaLinux:"): - return ["x86_64"] if project.startswith("Raspbian:"): return ["armv7l"] @@ -226,21 +224,6 @@ prjconf += f"{line}\n" - # Extend the AlmaLinux prjconf to also set CentOS variables, as some of - # our prjconfigs and spec files rely on them - if project == "AlmaLinux:8": - print(f" appending CentOS 8 variables") - prjconf += "\n" - prjconf += "# CentOS 8 compat added by sync script\n" - prjconf += "%define centos_version 800\n" - prjconf += "%define centos_ver 8\n" - prjconf += "%define centos 8\n" - prjconf += "Macros:\n" - prjconf += "%centos_version 800\n" - prjconf += "%centos_ver 8\n" - prjconf += "%centos 8\n" - prjconf += ":Macros\n" - with open(temp_dest_new_prjconf, "w") as f: f.write(header) f.write(prjconf) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36717?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: I19fc021a950790eab8b8074ea1c0cdd34232f4f8 Gerrit-Change-Number: 36717 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-trx[osmith/1.6.2]: Bump version: 1.6.1.2-e81e-dirty → 1.6.2

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36716?usp=email ) Change subject: Bump version: 1.6.1.2-e81e-dirty → 1.6.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36716?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: Iaa88c0003bc6cf70163a8894836f7228d5bd6bfa Gerrit-Change-Number: 36716 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 08:13:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-trx[osmith/1.6.2]: doc/examples: fix missing config files in release tarballs

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 36715 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 08:13:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024