laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31936 ) Change subject: obs: add --version-append argument ...................................................................... obs: add --version-append argument Related: OS#2537 Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 --- M scripts/obs/lib/__init__.py M scripts/obs/lib/srcpkg.py 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 964b298..9682b19 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -63,6 +63,10 @@ parser.add_argument("-v", "--verbose", action="store_true", help="always print shell commands and their output," " instead of only printing them on error") + parser.add_argument("-e", "--version-append", + help="add a string at the end of the version, e.g." + " '~osmocom' for the wireshark package to" + " indicate that it is the version from our repo") def set_cmds_verbose(new_val): diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 5dbc862..a58ae15 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -136,15 +136,21 @@ def build(project, gerrit_id=0): conflict_version = lib.args.conflict_version feed = lib.args.feed + version_append = lib.args.version_append + lib.git.clone(project) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) else: checkout_for_feed(project) + version = get_version_for_feed(project) + if version_append: + version += version_append epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version + has_rpm_spec = lib.rpm_spec.get_spec_in_path(project) is not None print(f"{project}: building source package {version_epoch}") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 Gerrit-Change-Number: 31936 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged