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

[Po-Hsu Lin]

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

KERNTT-881
The netsniff-ng depends on the ntp package. But after we enabled the
fipsdevppa for installing FIPS compliant userspace tools, the ntp
installation will fail because it will try to run the MD5 sum which
is prohibited by FIPS.

Drop this package when testing FIPS kernels, the tradeoff is the
altnames.sh test will be skipped.

Patch tested on maas@obruchev and it's working as expected.

[Magali Lemes do Sacramento (magalilemes)]

LGTM! Thanks

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks.

diff --git a/ubuntu_kselftests_net/ubuntu_kselftests_net.py b/ubuntu_kselftests_net/ubuntu_kselftests_net.py
index 9f1cd37..5267c10 100644
--- a/ubuntu_kselftests_net/ubuntu_kselftests_net.py
+++ b/ubuntu_kselftests_net/ubuntu_kselftests_net.py
@@ -21,7 +21,6 @@ class ubuntu_kselftests_net(test.test):
             'libfuse-dev',      # For net:reuseport_bpf_numa
             'libnuma-dev',      # For net:reuseport_bpf_numa
             'libssl-dev',       # For net:tcp_mmap
-            'netsniff-ng',      # For net:altnames.sh
             'net-tools',        # For net:rtnetlink.sh
             'pkg-config',
             'tcpdump',          # For net:cmsg_ipv6.sh
@@ -30,6 +29,11 @@ class ubuntu_kselftests_net(test.test):
         # For net:fib_tests.sh
         if not self.series in ['trusty', 'xenial', 'bionic']:
             pkgs.append('socat')
+        # For net:altnames.sh
+        if 'fips' not in self.flavour:
+            # netsniff-ng depends on ntp, it will try to perorm a MD5 sum which is not allowed with FIPS kernels (LP: #2054609)
+            pkgs.append('netsniff-ng')
+
         if not self.arch == 's390x':
             if not self.series in ['trusty', 'xenial', 'bionic', 'focal', 'jammy']:
                 # With recent kernels BPF requires lld (LLVM-based linker) to