mfi-common: Enable livepatch tests in 4.10 and 4.11 as intended (!)

The pattern xen-4.1* matches xen-4.10-testing, xen-4.11-testing, etc.
The right approach is to state the excluded branch names explicitly
as is done elsewhere.

Resulting changes (standalone-generate-dump-flight-runvars):
 * new jobs: test-amd64-{amd64,i386}-livepatch
 * runvar set: enable_livepatch=true in build-ARCH, build-ARCH-xsm
 * all of the above in branches: xen-4.10-testing xen-4.11-testing

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/mfi-common b/mfi-common
index 7ad81162a384d7a09145b29b5ac9e8f3814f4311..83d3c7130c3c5cd29fbefb2e178395c03fb858f7 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -85,14 +85,14 @@ branch_wants_xtf_tests () {
 branch_wants_livepatch () {
   case "$branch" in
     xen-3.*)    return 1;;
-    xen-4.0*)   return 1;;
-    xen-4.1*)   return 1;;
-    xen-4.2*)   return 1;;
-    xen-4.3*)   return 1;;
-    xen-4.4*)   return 1;;
-    xen-4.5*)   return 1;;
-    xen-4.6*)   return 1;;
-    xen-4.7*)   return 1;;
+    xen-4.0-testing)   return 1;;
+    xen-4.1-testing)   return 1;;
+    xen-4.2-testing)   return 1;;
+    xen-4.3-testing)   return 1;;
+    xen-4.4-testing)   return 1;;
+    xen-4.5-testing)   return 1;;
+    xen-4.6-testing)   return 1;;
+    xen-4.7-testing)   return 1;;
     xen-*)      return 0;;
     osstest*)   return 0;;
     *)          return 1;;