canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+447879@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:setup_timeout into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)
Related bugs:
  Bug #2028692 in Auto Package Testing: "Should not wait 30 minutes for an instance to be provisioned"
  https://bugs.launchpad.net/auto-package-testing/+bug/2028692

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/447879
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:setup_timeout 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 980d63b..fa0e217 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -1036,6 +1036,14 @@ def request(msg):
             pkgname,
         ).split()
 
+        # Add the timeout setup arg
+        i = 0
+        while argv[i] != "-s":
+            i += 1
+        i += 2
+        argv.insert(i, "600")
+        argv.insert(i, "--setup-timeout")
+
         if "swiftuser" in params:
             private = True
         elif private: