canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+463801@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:worker-re-enable-retries into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/463801
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:worker-re-enable-retries into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index 3511171..24d0367 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -1213,16 +1213,6 @@ def request(msg):
                     ] + [
                         s for s in FAIL_STRINGS_REGEX if re.search(s, contents)
                     ]
-                    # we're setting fails to True-ish manually here to avoid
-                    # any retries on testbed failures that aren't
-                    # infrastructure related
-                    fails = ["cloud-worker forced fail string"]
-                    # We set retry to 3 manually here as a quick hack
-                    # to avoid retrying for anything other than
-                    # tempfail testbed failures.
-                    # The retry variable is the crux of this loop
-                    # so manually setting it avoids the looping.
-                    retry = 2
 
                     if fails:
                         num_failures += 1