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

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

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

05 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects ...................................................................... obs: srcpkg.py: Run generate_build_dep.sh for all projects Adjust srcpkg.py to run a generate_build_dep.sh not only for osmo_dia2gsup, but for any Osmocom project that has such a script. This is in preparation for osmo-epdg, which will also have one. Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 27 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index cffb961..324bc66 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -103,13 +103,6 @@ return "" -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")) - - def prepare_project_open5gs(): """ Download the subproject sources here, so the package can be built in OBS without Internet access. """ @@ -124,6 +117,17 @@ "-i", "debian/control"], cwd=lib.git.get_repo_path("limesuite")) +def run_generate_build_dep(project): + """ Run contrib/generate_build_dep.sh if it exists in the given project, to + to download sources for dependencies (see e.g. osmo_dia2gsup.git). """ + repo_path = lib.git.get_repo_path(project) + script_path = "contrib/generate_build_dep.sh" + + if os.path.exists(f"{repo_path}/{script_path}"): + print(f"{project}: running {script_path}") + lib.run_cmd(script_path, cwd=repo_path) + + def write_tarball_version(project, version): repo_path = lib.git.get_repo_path(project) @@ -182,6 +186,9 @@ print(f"{project}: running {project_specific_func}") globals()[project_specific_func]() + if project in lib.config.projects_osmocom: + run_generate_build_dep(project) + lib.debian.build_source_package(project) lib.debian.move_files_to_output(project) -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

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

05 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: obs: srcpkg.py: Run generate_build_dep.sh for all 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/+/34662?usp=email ) Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 15:39:47 +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 for all projects
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 for all projects ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Fine with it, feel free to take care of this patch and the other 2 on top :) Done -- 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: 2 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:39:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[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 uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34664?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/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: 2 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-MessageType: newpatchset

1 0

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

05 Oct '23

Attention is currently required from: pespin. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34665?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/2 -- 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: 2 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-MessageType: newpatchset

1 0

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

05 Oct '23

Attention is currently required from: osmith. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/34662?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: obs: srcpkg.py: Run generate_build_dep.sh for all projects ...................................................................... obs: srcpkg.py: Run generate_build_dep.sh for all projects Adjust srcpkg.py to run a generate_build_dep.sh not only for osmo_dia2gsup, but for any Osmocom project that has such a script. This is in preparation for osmo-epdg, which will also have one. Change-Id: Icd9dc734ec938398668640f77ec83aae4a1ee0f4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/34662/2 -- 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: 2 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-MessageType: newpatchset

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+2 -- 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:18:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: Fix typo in log line informing variable to be modified
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/+/34665?usp=email ) Change subject: obs: Fix typo in log line informing variable to be modified ...................................................................... Patch Set 1: Code-Review+2 -- 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-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:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0