From 2619f1765b729afb5d9988e799242fe4a0a7be42 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 14 2020 11:22:39 +0000 Subject: Drop the use of the pkgslist since there are only two packages considered Signed-off-by: Pierre-Yves Chibon --- diff --git a/monitor_gating_multi_builds.py b/monitor_gating_multi_builds.py index 41a0880..0fd3f71 100644 --- a/monitor_gating_multi_builds.py +++ b/monitor_gating_multi_builds.py @@ -147,26 +147,22 @@ def main(): conf = toml.load(args.conf) fas_username = conf["fas_username"] - pkgslist = [conf["name_multi_1"], conf["name_multi_2"]] with tempfile.TemporaryDirectory(prefix="ci-test-") as folder: print(f"Working in {folder}\n") nevrs = {} # Bump the release on both packages: - for idx, name in enumerate(pkgslist): - if idx < 1: - nevrs, side_tag_name = clone_and_bump( - folder, nevrs, conf, name, new_side_tag=True) - else: - nevrs, _ = clone_and_bump( - folder, nevrs, conf, name, target=side_tag_name) + nevrs, side_tag_name = clone_and_bump( + folder, nevrs, conf, conf["name_multi_1"], new_side_tag=True) + nevrs, _ = clone_and_bump( + folder, nevrs, conf, conf["name_multi_2"], target=side_tag_name) # Chain-build the packages chain_build_packages( conf["fedpkg"], - packages=pkgslist[0], - folder=os.path.join(folder, pkgslist[1]), + packages=conf["name_multi_1"], + folder=os.path.join(folder, conf["name_multi_2"]), target=side_tag_name ) @@ -191,7 +187,7 @@ def main(): # Check the tag of the build get_build_tags( conf.get("koji_hub"), - nevrs[pkgslist[0]], + nevrs[conf["name_multi_1"]], expected_ends=["signing-pending", "testing-pending"], )