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

[Po-Hsu Lin]

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

On Lunar, ubuntu_bpf test will need libssl-dev to build.
Instead of adding another if statement for checking the series,
I decided to add it to the pkg list as this package is available
in the archive since Xenial.

[Andrei Gherzan (agherzan)]

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/ubuntu_bpf/ubuntu_bpf.py b/ubuntu_bpf/ubuntu_bpf.py
index f718d13..0c52a7e 100644
--- a/ubuntu_bpf/ubuntu_bpf.py
+++ b/ubuntu_bpf/ubuntu_bpf.py
@@ -19,13 +19,14 @@ class ubuntu_bpf(test.test):
             'git',
             'libcap-dev',
             'libelf-dev',
+            'libssl-dev',
         ]
         gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
         pkgs.append(gcc)
 
         if self.series == 'jammy':
-            if not re.match('5\.15\.0-.*' ,platform.release()):
-                pkgs.extend(['gcc-12', 'libssl-dev'])
+            if not re.match('5\.15\.0-.*', platform.release()):
+                pkgs.append('gcc-12')
 
         if self.series == 'focal':
             if self.kv.startswith('5.6.0'):