QA Regression Testing

Merge ~arighi/qa-regression-testing:skip-random-trust-cpu-check-with-kernel-6.2 into qa-regression-testing:master

  1. Git
  2. lp:~arighi/qa-regression-testing
  3. skip-random-trust-cpu-check-with-kernel-6.2
  4. Merge into master
Proposed by Andrea Righi
Status: Merged
Merged at revision: 2548c39948bb00d705a42be11fba34ba07672d3c
Proposed branch: ~arighi/qa-regression-testing:skip-random-trust-cpu-check-with-kernel-6.2
Merge into: qa-regression-testing:master
Diff against target: 16 lines (+4/-1)
1 file modified
scripts/test-kernel-security.py (+4/-1)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+439658@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

LGTM

review: Approve

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 b6558ed..c855cbd 100755
3--- a/scripts/test-kernel-security.py
4+++ b/scripts/test-kernel-security.py
5@@ -2972,7 +2972,10 @@ class KernelSecurityConfigTest(KernelSecurityBaseTest):
6 # See LP: #1990090
7 # The only exception is ARM64, RANDOM_TRUST_CPU depends on
8 # ARCH_RANDOM which is only available in v5.6 stable for ARM64
9- if self.dpkg_arch == 'arm64' and not self._test_config('ARCH_RANDOM'):
10+ if self.kernel_at_least('6.2'):
11+ self._skipped('RANDOM_TRUST_CPU has been dropped in v6.2')
12+ expected = False
13+ elif self.dpkg_arch == 'arm64' and not self._test_config('ARCH_RANDOM'):
14 self._skipped('arm64 does not support ARCH_RANDOM before v5.6')
15 expected = False
16 elif not self.kernel_at_least('4.9'):

Subscribers

People subscribed via source and target branches