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

[Tim Andersson]

[Tim Andersson (andersson123)]

Testing it now

[Brian Murray (brian-murray)]

I think it'd be best to have dictionary of releases and arches as we may need to expand this in the future.

review: Needs Fixing

[Tim Andersson (andersson123)]

Ready for re-review

[Tim Andersson (andersson123)]

Forgot to say, amended this morning. Ready for re-review

[Brian Murray (brian-murray)]

If you have not already, could you run this again in staging and point to the results to demonstrate what the version column now shows? (It had previously shown "trigger:" in the version column which seemed problematic.)

review: Needs Information

[Tim Andersson (andersson123)]

Hm, I queued it yesterday, seems it's not been absorbed. Will look into it

[Tim Andersson (andersson123)]

Oh, I have a minor bug, fixing.

[Tim Andersson (andersson123)]

https://autopkgtest.staging.ubuntu.com/packages/debvm/mantic/amd64

Amended, you can see the test for debvm at 2023-07-19 08:48:50 UTC as an example.

[Brian Murray (brian-murray)]

I looked at the example run in staging and it looks great, thanks!

I missed this earlier but the check that you are adding is outside of the 'try:' 'finally:' block and the 'finally:' block calls shutil.rmtree(work_dir). Was that change deliberate? If not I think it'd be best if the release and arch check were inside the 'try:' section.

review: Needs Fixing

[Tim Andersson (andersson123)]

Ah, yes, you're right, good spot. I'll amend

[Tim Andersson (andersson123)]

Tested, ready for re-review

[Brian Murray (brian-murray)]

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 2af9dc1..980d63b 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -71,6 +71,8 @@ big_packages = set()
 long_tests = set()
 never_run = set()
 
+ARCH_RELEASE_ALLOW_MAPPING = {"trusty": ["amd64"], "xenial": ["amd64"]}
+
 FAIL_CODES = (4, 6, 12, 14, 20)
 
 # In the case of a tmpfail, look for these strings in the log and if they're
@@ -646,6 +648,29 @@ def request(msg):
 
     try:
         out_dir = os.path.join(work_dir, "out")
+        if (
+            release.lower() in ARCH_RELEASE_ALLOW_MAPPING
+            and architecture not in ARCH_RELEASE_ALLOW_MAPPING[release.lower()]
+        ):
+            os.makedirs(out_dir)
+            # these will be written later on
+            code = 99
+            duration = 0
+            logging.info(
+                f'Only running {",".join(ARCH_RELEASE_ALLOW_MAPPING[release.lower()])} tests for release: {release.lower()}, test requests {architecture}'
+            )
+            # fake a log file
+            with open(os.path.join(out_dir, "log"), "w") as log:
+                log.write(
+                    f'Only running {",".join(ARCH_RELEASE_ALLOW_MAPPING[release.lower()])} tests for release: {release.lower()}, you have requested {architecture}'
+                )
+            with open(
+                os.path.join(out_dir, "testpkg-version"), "w"
+            ) as testpkg_version:
+                testpkg_version.write(
+                    f'Package blacklisted we only run {",".join(ARCH_RELEASE_ALLOW_MAPPING[release.lower()])} tests for {release.lower()}'
+                )
+            dont_run = True
 
         if request_matches_per_package(
             pkgname, architecture, release, never_run