Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/bpf-s390x-lld into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2040987

lld package is available for Mantic s390x but not J/L s390x, skip
it to prevent test build failure.

Also reconstruct the logic for adding clang / llvm / lld packages
to make it easier to read. Cleanup rules for unsupported kernels.

[Francis Ginther (fginther)]

Looks good, just the comment suggestion from Sean.

review: Approve

[Po-Hsu Lin (cypressyew)]

Comment added as suggested, stating why we need lld and why there is an exception for s390x.

[Francis Ginther (fginther)]

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks.

[Andrei Gherzan (agherzan)]

Looks good

review: Approve

diff --git a/ubuntu_bpf/ubuntu_bpf.py b/ubuntu_bpf/ubuntu_bpf.py
index 313e95e..e93bce4 100644
--- a/ubuntu_bpf/ubuntu_bpf.py
+++ b/ubuntu_bpf/ubuntu_bpf.py
@@ -28,20 +28,23 @@ class ubuntu_bpf(test.test):
             if not re.match('5\.15\.0-.*', platform.release()):
                 pkgs.append('gcc-12')
 
-        if self.series == 'focal':
-            if self.kv.startswith('5.6.0'):
-                # Specical case of F-oem-5.6 (lp:1879360)
-                pkgs.extend(['clang-10', 'llvm-10'])
-            else:
-                pkgs.extend(['clang-9', 'llvm-9'])
-        elif self.series == 'bionic':
-            if self.kv.startswith('5.4.0') or self.kv.startswith('5.3.0'):
+        clang = 'clang'
+        llvm = 'llvm'
+        lld = ''  # lld is required for Jammy+ (added in commit 254624a8), add it later in series check
+        if self.series == 'bionic':
+            if self.kv.startswith('5.4.0'):
                 # Special case for B-5.4 (lp:1882559) B-5.3 (lp:1845860)
-                pkgs.extend(['clang-9', 'llvm-9'])
-            else:
-                pkgs.extend(['clang', 'llvm'])
+                clang = 'clang-9'
+                llvm = 'llvm-9'
+        elif self.series == 'focal':
+            clang = 'clang-9'
+            llvm = 'llvm-9'
         else:
-            pkgs.extend(['clang', 'llvm', 'lld'])
+            lld = 'lld'
+            # Special case for J/L s390x (lp:2040987), M-s390x is not affected
+            if arch == 's390x' and self.series in ['jammy', 'lunar']:
+                lld = ''
+        pkgs.extend([clang, llvm, lld])
 
         cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)