QA Regression Testing

Merge ~mhcerri/qa-regression-testing/+git/qa-regression-testing:gcp-fix into qa-regression-testing:master

  1. Git
  2. lp:~mhcerri/qa-regression-testing/+git/qa-regression-testing
  3. gcp-fix
  4. Merge into master
Proposed by Marcelo Cerri
Status: Merged
Merged at revision: 00e4e841efcad9d0a2dee19283ff0aeb1c6f9fe5
Proposed branch: ~mhcerri/qa-regression-testing/+git/qa-regression-testing:gcp-fix
Merge into: qa-regression-testing:master
Diff against target: 23 lines (+5/-3)
1 file modified
scripts/test-kernel-security.py (+5/-3)
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+419400@code.launchpad.net

Description of the change

We are encountering a problem with 5.4 gcp kernels that is similar to a previous failure we had before with linux-oracle when we enabled arm64 support for it.

The commit just extends the same logic that was added for linux-oracle to linux-gcp. More details at:

https://bugs.launchpad.net/ubuntu-kernel-tests/+bug/1968841

To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

Unfortunately, that bug is private, so I can't see the discussion, but the change looks okay.

Thanks1

review: Approve
Revision history for this message
Marcelo Cerri (mhcerri) wrote :

Thanks! I made the bug public for reference.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
2index a5627f5..8548a6c 100755
3--- a/scripts/test-kernel-security.py
4+++ b/scripts/test-kernel-security.py
5@@ -559,13 +559,15 @@ class KernelSecurityTest(KernelSecurityBaseTest):
6 # ac7b34218a0021bafd1d4c11c54217b930f516b0, and for
7 # armhf when the CPU supports NX.
8 rie_expected = -11
9- elif (self.dpkg_arch in ['amd64', 'arm64'] and self.kernel_at_least('5.4')
10- and self.kernel_version.endswith('-oracle')):
11+ elif self.dpkg_arch in ['amd64', 'arm64'] and self.kernel_at_least('5.4'):
12 # oracle 5.4 cloud kernels as of 5.4.0-1045.49 now include a
13 # backport of ac7b34218a0021bafd1d4c11c54217b930f516b0,
14 # which was necessary for improved arm support, I guess.
15 # https://bugs.launchpad.net/qa-regression-testing/+bug/1928021
16- rie_expected = -11
17+ # The same applies to gcp kernels and its FIPS derivatives.
18+ for flavour in ('-oracle', '-gcp'):
19+ if flavour in self.kernel_version:
20+ rie_expected = -11
21
22 # These will all work since READ_IMPLIES_EXEC gets set
23 self.assertShellExitEquals(0, ["./nx-test-rie", "mmap-exec"])

Subscribers

People subscribed via source and target branches