Merge ~canonical-kernel-team/+git/autotest-client-tests:magalilemes/fix-2032807 into ~canonical-kernel-team/+git/autotest-client-tests:master

[Magali Lemes do Sacramento]

Tested on j:linux-aws-fips.

[Po-Hsu Lin (cypressyew)]

+1
Sorry for the trouble.

review: Approve

[Francis Ginther (fginther)]

+1

diff --git a/ubuntu_bpf/ubuntu_bpf.py b/ubuntu_bpf/ubuntu_bpf.py
index 516bc58..313e95e 100644
--- a/ubuntu_bpf/ubuntu_bpf.py
+++ b/ubuntu_bpf/ubuntu_bpf.py
@@ -43,11 +43,6 @@ class ubuntu_bpf(test.test):
         else:
             pkgs.extend(['clang', 'llvm', 'lld'])
 
-        # Build header first (LP: #2031400)
-        if not self.series in ['trusty', 'xenial', 'bionic', 'focal']:
-            cmd = "make -C linux/ headers"
-            utils.system_output(cmd, retain_output=True)
-
         cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)
 
@@ -79,6 +74,11 @@ class ubuntu_bpf(test.test):
         # Assist local testing by restoring the linux repo to vanilla.
         self.extract()
 
+        # Build header first (LP: #2031400)
+        if not self.series in ['trusty', 'xenial', 'bionic', 'focal']:
+            cmd = "make -C linux/ headers"
+            utils.system_output(cmd, retain_output=True)
+
         # clean source tree so changes from debian.foo/reconstruct
         # (e.g. deleting files) are applied
         os.chdir('linux')