Merge ~andersson123/autopkgtest-cloud:amend_trusty_service_files into autopkgtest-cloud:master

[Tim Andersson]

[Tim Andersson (andersson123)]

ready for review

[Tim Andersson (andersson123)]

amended, removed some unnecessary changes, please review.

[Brian Murray (brian-murray)]

I think at least one change is necessary and another would be nice to have. What kind of testing have you done of this in staging?

review: Needs Fixing

[Tim Andersson (andersson123)]

Adding and removing trusty and xenial from the service bundle, doing mojo runs and evaluating the state of the autopkgtest services as well as the presence of ensure adt images and build adt image service files

[Tim Andersson (andersson123)]

Amended, please re-review

[Brian Murray (brian-murray)]

The unit_tests passed for me locally but I didn't have the proxy server set up so that could be an issue. Please investigate the test failure.

:: Ran 63 tests in 1.176s
::
:: OK

review: Needs Fixing

[Brian Murray (brian-murray)]

Once the unit tests are sorted this looks good to me.

diff --git a/charms/focal/autopkgtest-cloud-worker/lib/systemd.py b/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
index a7f6c19..3df8f98 100644
--- a/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
+++ b/charms/focal/autopkgtest-cloud-worker/lib/systemd.py
@@ -9,6 +9,11 @@ from lib.utils import UbuntuRelease
 
 SYSTEM_BUS = Gio.bus_get_sync(Gio.BusType.SYSTEM)
 
+ARCH_RELEASE_ALLOW_MAPPING = {
+    "trusty": ["amd64", "i386"],
+    "xenial": ["amd64", "i386"],
+}
+
 
 def get_unit_names(region, arch, ns):
     if arch == "amd64":
@@ -170,7 +175,11 @@ def get_units():
 def update_cloud_dropins(region, arch, n, releases):
     # re-create, to support fiddling on upgrade
     def get_arches(release):
-        if arch == "amd64" and UbuntuRelease(release) < UbuntuRelease("focal"):
+        if release in ARCH_RELEASE_ALLOW_MAPPING:
+            return ARCH_RELEASE_ALLOW_MAPPING[release]
+        elif arch == "amd64" and UbuntuRelease(release) < UbuntuRelease(
+            "focal"
+        ):
             return ["amd64", "i386"]
         else:
             return [arch]
@@ -342,6 +351,28 @@ def set_up_systemd_units(target_cloud_config, target_lxd_config, releases):
                 )
                 disable_timer(region, arch, releases_to_disable)
 
+            for release in releases:
+                if release in ARCH_RELEASE_ALLOW_MAPPING:
+                    if arch not in ARCH_RELEASE_ALLOW_MAPPING[release]:
+                        if os.path.exists(
+                            "/etc/systemd/system/build-adt-image@"
+                            + release
+                            + "-"
+                            + region
+                            + "-"
+                            + arch
+                            + ".timer"
+                        ):
+                            os.remove(
+                                "/etc/systemd/system/build-adt-image@"
+                                + release
+                                + "-"
+                                + region
+                                + "-"
+                                + arch
+                                + ".timer"
+                            )
+
     # now do lxd. the target config is a dict arch -> IP -> nworkers
     all_lxd_arches = set(
         list(lxd_unit_object_paths.keys()) + list(target_lxd_config.keys())
diff --git a/mojo/service-bundle b/mojo/service-bundle
index f85cc66..0c59c26 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 noble" %}
+    {%- set releases = "trusty xenial bionic focal jammy lunar mantic noble" %}
     {%- set channel = "latest/stable" %}
 {%- elif stage_name == "staging" or stage_name == "devel" %}
     {%- set releases = "focal jammy lunar mantic" %}