From 9949c1e46d51948ca061dc845f886c86df9d6731 Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Oct 15 2020 11:43:13 +0000 Subject: [PATCH 1/2] Moved start_dg to before the update starts, global 180 wait tor the events. --- diff --git a/monitor_gating/multi_builds.py b/monitor_gating/multi_builds.py index ef59242..d7a5647 100644 --- a/monitor_gating/multi_builds.py +++ b/monitor_gating/multi_builds.py @@ -104,6 +104,7 @@ def main(args, utils=None): nevrs, _ = utils.bump( folder, nevrs, conf, conf["name_multi_2"], version=version, target=side_tag_name ) + start_dg = datetime.datetime.utcnow() # Chain-build the packages utils.chain_build_packages( @@ -146,10 +147,10 @@ def main(args, utils=None): topic=f"org.fedoraproject.{conf['_env']}.bodhi.update.status." "testing.koji-build-group.build.complete", bodhi_id=updateid, + duration=180, + start=start_dg, ) - start_dg = datetime.datetime.utcnow() - nevr_names = [] for name in nevrs: nevr = nevrs[name] diff --git a/monitor_gating/single_build.py b/monitor_gating/single_build.py index 5c5c520..ff51ca4 100644 --- a/monitor_gating/single_build.py +++ b/monitor_gating/single_build.py @@ -192,6 +192,8 @@ def main(args): else: nevr = args.nevr + start_dg = datetime.datetime.utcnow() + # Retrieve or create the update updateid = utils.get_update_id(nevr, conf["bodhi"]) if not args.update and not args.auto_update: @@ -236,19 +238,17 @@ def main(args): name="CI (running)", topic=f"org.centos.{conf['_ci_env']}.ci.koji-build.test.running", nevr=nevr, - duration=120, + duration=180, start=start_dg, ) - start_dg = datetime.datetime.utcnow() - # Check at the CI pipeline has completed utils.lookup_results_datagrepper( base_url=conf["datagrepper"], name="CI (complete)", topic=f"org.centos.{conf['_ci_env']}.ci.koji-build.test.error", nevr=nevr, - duration=60, + duration=180, start=start_dg, ) @@ -270,7 +270,7 @@ def main(args): name="resultsdb", topic=f"org.fedoraproject.{conf['_env']}.resultsdb.result.new", nevr=nevr, - duration=120, + duration=180, start=start_dg, ) @@ -280,7 +280,7 @@ def main(args): name="greenwave", topic=f"org.fedoraproject.{conf['_env']}.greenwave.decision.update", nevr=nevr, - duration=150, + duration=180, start=start_dg, ) From 138317c050db161f5bab9b8349676577d34b3c54 Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Oct 15 2020 11:44:55 +0000 Subject: [PATCH 2/2] added postgres client for experiments --- diff --git a/Dockerfile b/Dockerfile index 09c6efa..b13052c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ LABEL maintainer "Fedora Infrastructure Team