Merge ~xnox/+git/kteam-tools:invalid-yaml into ~canonical-kernel/+git/kteam-tools:master

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Andy Whitcroft
Approved revision: 24908fc7c2efac75201ee6a5df19a0f60cb56641
Merge reported by: Andy Whitcroft
Merged at revision: 24908fc7c2efac75201ee6a5df19a0f60cb56641
Proposed branch: ~xnox/+git/kteam-tools:invalid-yaml
Merge into: ~canonical-kernel/+git/kteam-tools:master
Diff against target: 42 lines (+2/-5)
1 file modified
info/kernel-series.yaml (+2/-5)
Reviewer Review Type Date Requested Status
Andy Whitcroft Approve
Review via email: mp+403200@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andy Whitcroft (apw) wrote :

Looks reasonable indeed. Merging looks to be intended in the `swm:` cases, for `invalid-tasks:` it is less certain but this seems better than the alternative of losing information.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/info/kernel-series.yaml b/info/kernel-series.yaml
2index 5e3cfcb..f7c27b7 100644
3--- a/info/kernel-series.yaml
4+++ b/info/kernel-series.yaml
5@@ -1000,7 +1000,6 @@
6 derived-from: [ '20.10', 'linux' ]
7 swm:
8 deployment-blackout: *swm-azure-blackout
9- swm:
10 kernel-testing: true
11 testing:
12 flavours:
13@@ -4451,13 +4450,12 @@
14 # arches: ['armhf']
15 supported: false
16 derived-from: [ '16.04', 'linux' ]
17- invalid-tasks: [ 'regression-testing' ]
18 testing:
19 flavours:
20 raspi2:
21 arches: ['armhf', 'arm64'] # test system arch names
22 clouds: ['metal']
23- invalid-tasks: [ 'automated-testing', 'certification-testing' ]
24+ invalid-tasks: [ 'automated-testing', 'certification-testing', 'regression-testing' ]
25
26 # Kernel is no longer supported
27 linux-snapdragon:
28@@ -4478,13 +4476,12 @@
29 # arches: ['arm64']
30 supported: false
31 derived-from: [ '16.04', 'linux' ]
32- invalid-tasks: [ 'regression-testing' ]
33 testing:
34 flavours:
35 snapdragon:
36 arches: ['armhf'] # test system arch names
37 clouds: ['metal']
38- invalid-tasks: [ 'automated-testing', 'certification-testing' ]
39+ invalid-tasks: [ 'automated-testing', 'certification-testing', 'regression-testing' ]
40
41 linux-fips:
42 routing: fips

Subscribers

People subscribed via source and target branches