osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37650?usp=email )
Change subject: OBS: fix up-to-date check for strongswan-epdg ......................................................................
OBS: fix up-to-date check for strongswan-epdg
Move the code to transform the version from the git tag to the version that we can use in debian/changelog to a separate function. Use it not only when generating the version for debian/changelog, but also when checking if the current git tag is up-to-date.
Without this patch, it always considers strongswan-epdg outdated: strongswan-epdg: building source package (outdated: osmo-epdg-0.1.2 <=> 0.1.2.osmo.epdg in OBS)
Change-Id: I515695d52f5d37b256ef163875417745897e5900 --- M scripts/obs/lib/debian.py M scripts/obs/update_obs_project.py 2 files changed, 28 insertions(+), 4 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved 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 3c0c2a5..585c447 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -92,6 +92,14 @@ return ret
+def transform_version(version): + if "osmo-epdg-" in version: + version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" + + version = version.replace("-", ".") + return version + + def changelog_add_entry_if_needed(project, version): """ Adjust the changelog if the version in the changelog is different from the given version. """ @@ -113,10 +121,7 @@ pass
# Debian versions must start with a digit - if "osmo-epdg-" in version: - version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" - - version = version.replace("-", ".") + version = transform_version(latest_version)
if version_changelog == version: return diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 08d789d..0852693 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -7,6 +7,7 @@ import traceback import lib import lib.config +import lib.debian import lib.docker import lib.git import lib.metapkg @@ -97,6 +98,7 @@ branch_missing_ok=delete) else: latest_version = lib.git.get_latest_tag_remote(package) + latest_version = lib.debian.transform_version(latest_version)
if latest_version is None: if delete and os.path.basename(package) in pkgs_remote:
-
osmith