Attention is currently required from: fixeria.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email )
Change subject: gen_makefile: --targets: fix subdir projects
......................................................................
Patch Set 1:
(1 comment)
File gen_makefile.py:
https://gerrit.osmocom.org/c/osmo-dev/+/40978/comment/f6241805_702e8016?usp… :
PS1, Line 247: if "_" in project:
> Wouldn't this turn `osmo_dia2gsup` into `osmo`?
No, because this doesn't change `project` and because it checks if the resulting splitted string is a valid project from the `all.deps` file before attempting to placing it in the queue.
With `osmo_dia2gsup` this happens:
```
project_main = "osmo"
if "osmo" in project_deps: # -> False
# this gets skipped
# continue the same as without this change
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/40978?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I136f0d9cd982653b109005aeb35885b6f015eec8
Gerrit-Change-Number: 40978
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 01 Sep 2025 06:38:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email )
Change subject: OBS: --version-append: never override version
......................................................................
OBS: --version-append: never override version
We have some branches set up that when pushed to, directly result in
building OBS packages. We append a string to the package version there,
such as ~rhizomatica.testing. The expectation is that all packages built
from that branch have this string in the version.
Recently an edge case was found: when amending the commit of the last
tagged release, e.g. osmo-sgsn 1.12.0, then the generated version is
based on the previous git tag (as the last git tag's commit is not part
of the current branch anymore) while having the newer version in
debian/changelog. This then results in the newer version being used,
without appending the version string:
osmo-sgsn: WARNING: version from changelog (1.12.0) is higher than
version based on git tag (1.11.1.20-e000e~rhizomatica.production),
using version from changelog (git tag not pushed yet?)
While IMHO it is a bad idea to just amend the commit of the last release
instead of making a separate commit, this results in unexpected behavior
so adjust the script to not override the version if --version-append is
used.
Related: OS#5981
Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe
---
M scripts/obs/lib/debian.py
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py
index 9193d66..0438dd8 100644
--- a/scripts/obs/lib/debian.py
+++ b/scripts/obs/lib/debian.py
@@ -112,12 +112,13 @@
try:
if packaging.version.parse(version_changelog.split("-")[0]) > packaging.version.parse(version.split("-")[0]):
print(
- f"{project}: WARNING: version from changelog"
- f" ({version_changelog}) is higher than version based on git tag"
- f" ({version}), using version from changelog (git tag not pushed"
- " yet?)"
+ f"{project}: WARNING: version from changelog ({version_changelog}) is higher than version based on git tag ({version})"
)
- return
+ if lib.args.version_append:
+ print(f"{project}: WARNING: assuming commit from last git tag was amended, ignoring...")
+ else:
+ print(f"{project}: WARNING: using version from changelog (git tag not pushed yet?)")
+ return
except packaging.version.InvalidVersion:
# packaging.version.parse can parse the version numbers used in Osmocom
# projects (where we need the above check), but not e.g. some versions
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe
Gerrit-Change-Number: 40965
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: keith <keith(a)rhizomatica.org>
Attention is currently required from: keith, osmith.
fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email )
Change subject: OBS: --version-append: never override version
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ci/+/40965/comment/289bc60c_90b15c77?usp=… :
PS1, Line 25: While IMHO it is a bad idea to just amend the commit of the last release
> I think it would still be useful to merge this, it prevents an unexpected outcome and gives a warnin […]
Ah, I see now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40965?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I589ceb08b9e1ff2ccdd54e94216b25e1e40f22fe
Gerrit-Change-Number: 40965
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: keith <keith(a)rhizomatica.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Mon, 01 Sep 2025 06:17:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: keith <keith(a)rhizomatica.org>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?usp=email )
Change subject: testenv: use separate install dir for --asan
......................................................................
testenv: use separate install dir for --asan
The --asan flag builds all Osmocom components with address sanitizer
enabled. Use a separate install dir from the non-asan version to ensure
we don't end up with using non-asan versions. (A separate make dir is
already used.)
Bump make_dir_version to avoid having markers for already installed
binaries / libraries in the make dir, which are invalid now for
asan-builds as we switched the install dir.
Fixes: c3657172 ("testenv: add run --asan")
Change-Id: Ic75452b75d4c3ee8045b68353830b5532e1ce90e
---
M _testenv/testenv/cmd.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py
index 2cc590a..d637129 100644
--- a/_testenv/testenv/cmd.py
+++ b/_testenv/testenv/cmd.py
@@ -12,7 +12,7 @@
install_dir = None
make_dir = None
# osmo-dev make dir version, bump when making incompatible changes
-make_dir_version = 3
+make_dir_version = 4
def distro_cache_suffix():
@@ -33,6 +33,8 @@
install_dir = "/"
else:
install_dir = os.path.join(testenv.args.cache, "podman/install")
+ if testenv.args.asan:
+ install_dir += "-asan"
install_dir += distro_cache_suffix()
else:
install_dir = os.path.join(testenv.args.cache, "host/install")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40979?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic75452b75d4c3ee8045b68353830b5532e1ce90e
Gerrit-Change-Number: 40979
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
