canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+454132@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:amend_trusty_service_files 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/454132
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:amend_trusty_service_files into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/lib/systemd.py b/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
index a7f6c19..e88f2b7 100644
--- a/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
+++ b/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
@@ -9,6 +9,10 @@ from lib.utils import UbuntuRelease
 
 SYSTEM_BUS = Gio.bus_get_sync(Gio.BusType.SYSTEM)
 
+ARCH_RELEASE_BLACKLIST_MAP = {
+    "trusty": "s390x",
+}
+
 
 def get_unit_names(region, arch, ns):
     if arch == "amd64":
@@ -136,7 +140,14 @@ def get_units():
         if name.startswith("build-adt-image@") and name.endswith(".timer"):
             name_release_region_arch = name[16:][:-6]
             (release, region, arch) = name_release_region_arch.split("-", -1)
-            build_adt_image_object_paths[region][arch][release] = object_path
+            # FIXME:
+            # Consider turning this ARCH_RELEASE_BLACKLIST_MAP into a config
+            # file, since similar functionality is used in the worker script.
+            if release in ARCH_RELEASE_BLACKLIST_MAP:
+                if arch not in ARCH_RELEASE_BLACKLIST_MAP[release]:
+                    build_adt_image_object_paths[region][arch][
+                        release
+                    ] = object_path
             continue
 
         if not name.startswith("autopkgtest@"):
diff --git a/mojo/service-bundle b/mojo/service-bundle
index 3da62ad..caea043 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -1,5 +1,5 @@
 {%- if stage_name == "production" %}
-    {%- set releases = "xenial bionic focal jammy lunar mantic" %}
+    {%- set releases = "xenial trusty bionic focal jammy lunar mantic" %}
     {%- set channel = "latest/stable" %}
 {%- elif stage_name == "staging" or stage_name == "devel" %}
     {%- set releases = "focal jammy kinetic lunar mantic" %}