Merge autopkgtest-cloud:esm-specials into autopkgtest-cloud:master

[Brian Murray]

This adds support for a package config file which contains a list of packages and arches whose tests should run for ESM releases even though those arches are not supported in ESM. This is useful for packages like ubuntu-advantage-tools which end up following the regular SRU process even though the release is out of standard support.

[Brian Murray (brian-murray)]

I've already added esm_specials to autopkgtest-package-configs.

[Brian Murray (brian-murray)]

Once this is merged and deployed we should run some ubuntu-advantage-tools tests again.

[Skia (hyask)]

Link to esm_specials in autopkgtest-package-configs for other reviewers searching it: https://git.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-package-configs/commit/?id=706cc06102b7dc4e1f46f4847f297551fe56b7f9

Looks far better than previous proposal!

review: Approve

[Tim Andersson (andersson123)]

review: Approve

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index fbd5383..ffae8f0 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -70,6 +70,7 @@ hostname = socket.gethostname()
 big_packages = set()
 long_tests = set()
 never_run = set()
+esm_specials = set()
 
 ARCH_RELEASE_ALLOW_MAPPING = {
     "trusty": ["amd64", "i386"],
@@ -291,13 +292,14 @@ def read_per_package_configs(cfg):
                     out.add(f"{package}/{arch}/{release}")
             return out
 
-    global big_packages, long_tests, never_run
+    global big_packages, long_tests, never_run, esm_specials
 
     dir = cfg.get("autopkgtest", "per_package_config_dir").strip()
 
     big_packages = read_per_package_file(os.path.join(dir, "big_packages"))
     long_tests = read_per_package_file(os.path.join(dir, "long_tests"))
     never_run = read_per_package_file(os.path.join(dir, "never_run"))
+    esm_specials = read_per_package_file(os.path.join(dir, "esm_specials"))
 
 
 def request_matches_per_package(package, arch, release, s):
@@ -655,6 +657,9 @@ def request(msg):
         if (
             release.lower() in ARCH_RELEASE_ALLOW_MAPPING
             and architecture not in ARCH_RELEASE_ALLOW_MAPPING[release.lower()]
+            and not request_matches_per_package(
+                pkgname, architecture, release, esm_specials
+            )
         ):
             os.makedirs(out_dir)
             # these will be written later on