osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40429?usp=email ) Change subject: OBS: move meta_package_version to config variable ...................................................................... OBS: move meta_package_version to config variable Have a config variable instead of hardcoding the value two times. Change-Id: I003e27ed6d0247097ba33d33e578b9669be36f9a --- M scripts/obs/lib/config.py M scripts/obs/lib/metapkg.py M scripts/obs/update_obs_project.py 3 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/40429/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 4d8bcd3..1a22f23 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -168,3 +168,6 @@ ] check_new_distros_version_regex = re.compile(r'[0-9.]+$') + +# Version of the osmocom-latest / osmocom-nightly etc. meta package +meta_package_version = "1.0.0" diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 1b78777..b60e2f2 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -86,7 +86,7 @@ feed = lib.args.feed pkgname = lib.args.conflict_pkgname or f"osmocom-{feed}" conflict_version = lib.args.conflict_version - version = conflict_version if conflict_version else "1.0.0" + version = conflict_version if conflict_version else lib.config.meta_package_version print(f"{pkgname}: generating meta package {version}") prepare_source_dir(pkgname) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 0852693..6668a8e 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -91,7 +91,7 @@ the git remote. """ if is_meta_pkg: conflict_version = lib.args.conflict_version - latest_version = conflict_version if conflict_version else "1.0.0" + latest_version = conflict_version if conflict_version else lib.config.meta_package_version else: if feed == "master": latest_version = lib.git.get_head_remote(package, branch, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40429?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I003e27ed6d0247097ba33d33e578b9669be36f9a Gerrit-Change-Number: 40429 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>