Tim Andersson has proposed merging
~andersson123/autopkgtest-cloud:seed-new-release-refactor into
autopkgtest-cloud:master.
Commit message:
seed-new-release: refactor duplicate for loops
Requested reviews:
Canonical's Ubuntu QA (canonical-ubuntu-qa)
For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/445733
seed-new-release: refactor duplicate for loops
--
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~andersson123/autopkgtest-cloud:seed-new-release-refactor into
autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
index 05b2aab..24c595e 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
@@ -83,6 +83,21 @@ def copy_result(rel_path, source, target):
sys.exit(1)
+def iterate_files(package, arch, run_id, args, source_container, target_container):
+ for file in "artifacts.tar.gz", "result.tar", "log.gz":
+ path = "/%s/%s/%s/%s/%s" % (
+ arch,
+ srchash(package),
+ package,
+ run_id,
+ file,
+ )
+ if args.new_release + path in existing:
+ print("%s%s already exists, skipping" % (args.old_release, path))
+ continue
+ copy_result(path, source_container, target_container)
+
+
ap = argparse.ArgumentParser()
ap.add_argument("old_release")
ap.add_argument("new_release")
@@ -138,18 +153,7 @@ for package, arch, run_id in db_con.execute(
" OR triggers = 'migration-reference/0') "
"GROUP BY package, arch" % args.old_release
):
- for file in "artifacts.tar.gz", "result.tar", "log.gz":
- path = "/%s/%s/%s/%s/%s" % (
- arch,
- srchash(package),
- package,
- run_id,
- file,
- )
- if args.new_release + path in existing:
- print("%s%s already exists, skipping" % (args.old_release, path))
- continue
- copy_result(path, source_container, target_container)
+ iterate_files(package, arch, run_id, args, source_container, target_container)
for package, arch, run_id in db_con.execute(
"SELECT package, arch, MAX(run_id) "
@@ -158,15 +162,4 @@ for package, arch, run_id in db_con.execute(
" AND triggers = 'migration-reference/0' "
"GROUP BY package, arch" % args.old_release
):
- for file in "artifacts.tar.gz", "result.tar", "log.gz":
- path = "/%s/%s/%s/%s/%s" % (
- arch,
- srchash(package),
- package,
- run_id,
- file,
- )
- if args.new_release + path in existing:
- print("%s%s already exists, skipping" % (args.old_release, path))
- continue
- copy_result(path, source_container, target_container)
+ iterate_files(package, arch, run_id, args, source_container, target_container)
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
