osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/31927 )
Change subject: obs: don't pass proj through functions
......................................................................
obs: don't pass proj through functions
Change-Id: Id213ae155f34c74529845ff86468b68ffa6ffb1d
---
M scripts/obs/lib/osc.py
M scripts/obs/update_obs_project.py
2 files changed, 35 insertions(+), 22 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py
index df5c34c..6a1d42b 100644
--- a/scripts/obs/lib/osc.py
+++ b/scripts/obs/lib/osc.py
@@ -12,11 +12,12 @@
apiurl = None
-def check_proj(obs_project):
- if ":" in obs_project:
+def check_proj():
+ proj = lib.args.obs_project
+ if ":" in proj:
return
- print(f"ERROR: this doesn't look like a valid OBS project: {obs_project}")
+ print(f"ERROR: this doesn't look like a valid OBS project: {proj}")
exit(1)
@@ -56,13 +57,15 @@
return lib.run_cmd(cmd, *args, **kwargs)
-def get_remote_pkgs(proj):
+def get_remote_pkgs():
+ proj = lib.args.obs_project
print(f"OBS: getting packages in {proj}")
ret = run_osc(["list", proj])
return ret.output.rstrip().split("\n")
-def get_package_version(proj, package, feed):
+def get_package_version(package, feed):
+ proj = lib.args.obs_project
print(f"{package}: getting OBS version")
ret = run_osc(["list", proj, os.path.basename(package)])
@@ -87,7 +90,8 @@
" extracting the version from the file list")
-def create_package(proj, package):
+def create_package(package):
+ proj = lib.args.obs_project
print(f"{package}: creating new OBS package")
# cut off repository prefix like in "python/osmo-python-tests"
@@ -111,7 +115,8 @@
lib.run_cmd(["rm", "-rf", f"{lib.config.path_temp}/osc"])
-def update_package(proj, package, version):
+def update_package(package, version):
+ proj = lib.args.obs_project
print(f"{package}: updating OBS package")
# cut off repository prefix like in "python/osmo-python-tests"
diff --git a/scripts/obs/update_obs_project.py
b/scripts/obs/update_obs_project.py
index 0ae949b..5718a45 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -62,7 +62,7 @@
return False
-def build_srcpkg_if_needed(proj, feed, branch, pkgs_remote, package,
conflict_version,
+def build_srcpkg_if_needed(feed, branch, pkgs_remote, package,
conflict_version,
fetch, is_meta_pkg, skip_up_to_date):
global srcpkgs_skipped
@@ -85,7 +85,7 @@
if os.path.basename(package) not in pkgs_remote:
print(f"{package}: building source package (not in OBS)")
else:
- obs_version = lib.osc.get_package_version(proj, package, feed)
+ obs_version = lib.osc.get_package_version(package, feed)
if is_up_to_date(obs_version, latest_version):
if skip_up_to_date:
print(f"{package}: skipping ({obs_version} is up-to-date)")
@@ -104,28 +104,28 @@
build_srcpkg(feed, branch, package, conflict_version, fetch, is_meta_pkg)
-def upload_srcpkg(proj, feed, pkgs_remote, package, version):
+def upload_srcpkg(feed, pkgs_remote, package, version):
if os.path.basename(package) not in pkgs_remote:
- lib.osc.create_package(proj, package)
- lib.osc.update_package(proj, package, version)
+ lib.osc.create_package(package)
+ lib.osc.update_package(package, version)
-def build_srcpkgs(proj, feed, branch, pkgs_remote, packages, conflict_version,
fetch,
+def build_srcpkgs(feed, branch, pkgs_remote, packages, conflict_version, fetch,
meta, skip_up_to_date):
print()
print("### Building source packages ###")
print()
if meta:
- build_srcpkg_if_needed(proj, feed, branch, pkgs_remote,
f"osmocom-{feed}",
+ build_srcpkg_if_needed(feed, branch, pkgs_remote, f"osmocom-{feed}",
conflict_version, fetch, True, skip_up_to_date)
for package in packages:
- build_srcpkg_if_needed(proj, feed, branch, pkgs_remote, package,
+ build_srcpkg_if_needed(feed, branch, pkgs_remote, package,
conflict_version, fetch, False, skip_up_to_date)
-def upload_srcpkgs(proj, feed, pkgs_remote):
+def upload_srcpkgs(feed, pkgs_remote):
global srcpkgs_built
global srcpkgs_failed_upload
global srcpkgs_updated
@@ -142,7 +142,7 @@
for package, version in srcpkgs_built.items():
try:
- upload_srcpkg(proj, feed, pkgs_remote, package, version)
+ upload_srcpkg(feed, pkgs_remote, package, version)
srcpkgs_updated += [package]
except Exception as ex:
traceback.print_exception(type(ex), ex, ex.__traceback__)
@@ -194,7 +194,6 @@
help="package name, e.g. libosmocore or open5gs,"
" default is all packages")
args = parser.parse_args()
- proj = args.obs_project
feed = args.feed
branch = args.git_branch
packages = parse_packages(args.package)
@@ -204,7 +203,7 @@
if args.docker:
lib.docker.run_in_docker_and_exit("update_obs_project.py", True)
- lib.osc.check_proj(proj)
+ lib.osc.check_proj()
lib.osc.check_oscrc()
lib.osc.set_apiurl(args.apiurl)
@@ -213,11 +212,11 @@
lib.remove_temp()
- pkgs_remote = lib.osc.get_remote_pkgs(proj)
+ pkgs_remote = lib.osc.get_remote_pkgs()
- build_srcpkgs(proj, feed, branch, pkgs_remote, packages,
args.conflict_version,
+ build_srcpkgs(feed, branch, pkgs_remote, packages, args.conflict_version,
args.git_fetch, args.meta, args.skip_up_to_date)
- upload_srcpkgs(proj, feed, pkgs_remote)
+ upload_srcpkgs(feed, pkgs_remote)
exit_with_summary()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31927
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id213ae155f34c74529845ff86468b68ffa6ffb1d
Gerrit-Change-Number: 31927
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
