canonical-ubuntu-qa team mailing list archive

[Brian Murray <mp+460979@xxxxxxxxxxxxxxxxxx>]

Brian Murray has proposed merging autopkgtest-cloud:adt-region into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/460979

We had some issues with ppc64el tests in bos01 and while I did use `journalctl ADT_ARCH=ppc64el --since "30m ago" --follow` to watch for issues it would have been better if I could add `ADT_ARCH=bos01`.

This untested change should allow for that.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of autopkgtest-cloud:adt-region 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 0f992c6..c042189 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -673,6 +673,7 @@ def request(msg):
     )
 
     current_region = os.environ.get("REGION")
+    systemd_logging_handler._extra["ADT_REGION"] = current_region
 
     # build autopkgtest command line
     work_dir = tempfile.mkdtemp(prefix="autopkgtest-work.")