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

[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
by osmith 05 Oct '23

05 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) Change subject: obs: add erlang/osmo-epdg to projects_osmocom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?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: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:18:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > This would work, but how about we just run a `contrib/generate_build_dep. […] Fine with it, feel free to take care of this patch and the other 2 on top :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?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: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:17:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: add erlang/osmo-epdg to projects_osmocom
by pespin 05 Oct '23

05 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) Change subject: obs: add erlang/osmo-epdg to projects_osmocom ...................................................................... obs: add erlang/osmo-epdg to projects_osmocom Change-Id: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 --- M scripts/obs/lib/config.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/34664/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 3b2518f..33aced8 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -45,6 +45,7 @@ # and ensure the rpm and deb packages build successfully in jenkins. projects_osmocom = [ "erlang/osmo_dia2gsup", + "erlang/osmo-epdg", "libasn1c", "libgtpnl", "libosmo-abis", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34664?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: I5c5537e2d96752cb68fb251552bd444a9abf8cd1 Gerrit-Change-Number: 34664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
by pespin 05 Oct '23

05 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email ) Change subject: obs: Fix typo in log line informing variable to be modified ...................................................................... obs: Fix typo in log line informing variable to be modified Change-Id: I381f30ad2443bbd86a23d2808a5f8e3c650953b7 --- M scripts/obs/lib/__init__.py 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/34665/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 1f686e5..226015a 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -116,7 +116,7 @@ return package print(f"ERROR: unknown package: {package}") - print("See packages_osmocom and packages_other in obs/lib/config.py") + print("See projects_osmocom and projects_other in obs/lib/config.py") sys.exit(1) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34665?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: I381f30ad2443bbd86a23d2808a5f8e3c650953b7 Gerrit-Change-Number: 34665 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
by osmith 05 Oct '23

05 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This would work, but how about we just run a `contrib/generate_build_dep.sh` for any project, if it is in the git repository? (I could refactor it like that if you prefer) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?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: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:14:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: jobs/master: use same url scheme as gerrit jobs
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34660?usp=email ) Change subject: jobs/master: use same url scheme as gerrit jobs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34660?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: Ibe992dd8027a8b8df8623abc57a590972443449f Gerrit-Change-Number: 34660 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: Thu, 05 Oct 2023 15:13:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?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: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 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: Thu, 05 Oct 2023 15:13:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: Add debian build support
by pespin 05 Oct '23

05 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email ) Change subject: Add debian build support ...................................................................... Add debian build support Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f --- A contrib/generate_build_dep.sh A contrib/osmo-epdg.service A contrib/systemd/osmo-epdg.service A debian/changelog A debian/compat A debian/control A debian/osmo-epdg.install A debian/rules 8 files changed, 98 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/63/34663/1 diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 0000000..409c2f5 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory of the osmo-epdg directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete +tar czf build_dep.tar.gz ./_checkouts diff --git a/contrib/osmo-epdg.service b/contrib/osmo-epdg.service new file mode 100644 index 0000000..bfa8293 --- /dev/null +++ b/contrib/osmo-epdg.service @@ -0,0 +1,15 @@ +[Unit] +Description=Osmocom ePDG (Evolved Packet Data Gateway) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-epdg.service b/contrib/systemd/osmo-epdg.service new file mode 100644 index 0000000..a62a972 --- /dev/null +++ b/contrib/systemd/osmo-epdg.service @@ -0,0 +1,16 @@ +[Unit] +Description=Osmocom DIAMETER to GSUP translator +After=osmo-hlr.service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +Environment="HOME=/var/lib/osmo-epdg" +ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo-epdg +ExecStart=/usr/bin/osmo-epdg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/changelog @@ -0,0 +1 @@ + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c484b29 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: osmo-epdg +Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, + debhelper (>= 10) +Standards-Version: 4.5.0 + +Package: osmo-epdg +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom ePDG (Evolved Packet Data Gateway) + diff --git a/debian/osmo-epdg.install b/debian/osmo-epdg.install new file mode 100644 index 0000000..0840d06 --- /dev/null +++ b/debian/osmo-epdg.install @@ -0,0 +1,2 @@ +/contrib/systemd/osmo-epdg.service /lib/systemd/system/ +/_build/default/bin/osmo-epdg /usr/bin/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..89863f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi + rebar3 compile + rebar3 escriptize + rebar3 eunit + +override_dh_clean: + dh_clean + rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia835ef9be57c2c2b4d27aa8096d1e401356fe87f Gerrit-Change-Number: 34663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project
by pespin 05 Oct '23

05 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project ...................................................................... obs: srcpkg.py: Run generate_build_dep.sh in osmo-epdg project Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/34662/1 diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index cffb961..4eaaa47 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -102,13 +102,21 @@ return "" +def _prepare_project_erlang_common(project): + """ Run erlang/$(project)'s generate_build_dep.sh script to download + sources for dependencies. """ + lib.run_cmd("contrib/generate_build_dep.sh", + cwd=lib.git.get_repo_path("erlang/" + project)) def prepare_project_osmo_dia2gsup(): """ Run erlang/osmo_dia2gsup's generate_build_dep.sh script to download sources for dependencies. """ - lib.run_cmd("contrib/generate_build_dep.sh", - cwd=lib.git.get_repo_path("erlang/osmo_dia2gsup")) + _prepare_project_erlang_common("osmo_dia2gsup") +def prepare_project_osmo_epdg(): + """ Run erlang/osmo-epdg's generate_build_dep.sh script to download + sources for dependencies. """ + _prepare_project_erlang_common("osmo-epdg") def prepare_project_open5gs(): """ Download the subproject sources here, so the package can be built in @@ -177,7 +185,7 @@ os.makedirs(lib.get_output_path(project)) lib.remove_cache_extra_files() - project_specific_func = f"prepare_project_{os.path.basename(project)}" + project_specific_func = f"prepare_project_{os.path.basename(project).replace('-', '_')}" if project_specific_func in globals(): print(f"{project}: running {project_specific_func}") globals()[project_specific_func]() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34662?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: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 Gerrit-Change-Number: 34662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/master-builds: add erlang projects
by osmith 05 Oct '23

05 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34661?usp=email ) Change subject: jobs/master-builds: add erlang projects ...................................................................... jobs/master-builds: add erlang projects Add the erlang projects found in gerrit-verifications to master-builds too, as we have it with most other Osmocom projects. Change-Id: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 --- M jobs/master-builds.yml 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/34661/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index dcf40ef..8b8d551 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -66,6 +66,7 @@ -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_erlang: '$USER/debian-bookworm-erlang' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -270,6 +271,14 @@ -e WITH_MANUALS="$WITH_MANUALS" \ "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" + - osmo_dia2gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + + - osmo-epdg: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + - osmo-e1-hardware: a2_name: JOB_TYPE a2: !!python/tuple ["firmware", "gateware", "manuals", "software"] @@ -330,6 +339,10 @@ - osmo-gsm-manuals + - osmo_gsup: + repos_url: '{gerrit_url}/erlang/{repos}' + cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + - osmo-gsm-tester: cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins-build-manuals.sh' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34661?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: I6cf5a3c1e52ee73ad63eb2d7d5b1af19a9809026 Gerrit-Change-Number: 34661 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0