canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+466044@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:kill-server-on-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/466044
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:kill-server-on-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 af3b906..809f7ad 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -1320,6 +1320,11 @@ def request(msg):
                             True,
                             release,
                         )
+                        logging.info(
+                            "Killing openstack server with uuid %s",
+                            test_uuid,
+                        )
+                        kill_openstack_server(test_uuid)
                         cleanup_and_sleep(out_dir)
                 else:
                     # This block is reached in edge cases with undefined failures,