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

[Dimitri John Ledkov]

[Andy Whitcroft (apw)]

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

diff --git a/info/kernel-series.yaml b/info/kernel-series.yaml
index 5e3cfcb..f7c27b7 100644
--- a/info/kernel-series.yaml
+++ b/info/kernel-series.yaml
@@ -1000,7 +1000,6 @@
             derived-from: [ '20.10', 'linux' ]
             swm:
                 deployment-blackout: *swm-azure-blackout
-            swm:
                 kernel-testing: true
             testing:
                 flavours:
@@ -4451,13 +4450,12 @@
             #        arches: ['armhf']
             supported: false
             derived-from: [ '16.04', 'linux' ]
-            invalid-tasks: [ 'regression-testing' ]
             testing:
                 flavours:
                    raspi2:
                         arches: ['armhf', 'arm64']        # test system arch names
                         clouds: ['metal']
-            invalid-tasks: [ 'automated-testing', 'certification-testing' ]
+            invalid-tasks: [ 'automated-testing', 'certification-testing', 'regression-testing' ]
 
         # Kernel is no longer supported
         linux-snapdragon:
@@ -4478,13 +4476,12 @@
             #        arches: ['arm64']
             supported: false
             derived-from: [ '16.04', 'linux' ]
-            invalid-tasks: [ 'regression-testing' ]
             testing:
                 flavours:
                    snapdragon:
                         arches: ['armhf']        # test system arch names
                         clouds: ['metal']
-            invalid-tasks: [ 'automated-testing', 'certification-testing' ]
+            invalid-tasks: [ 'automated-testing', 'certification-testing', 'regression-testing' ]
 
         linux-fips:
             routing: fips