[OSSTEST,04/11] mfi-common: Add an enable_livepatch runvar to the Xen build jobs

Commit Message

Ian Jackson June 7, 2017, 5:48 p.m. UTC

From: Konrad Rzeszutek Wilk <[e-mail]>

Set it to true on branches that support livepatching (Xen versions 4.9
and higher).  Currently nothing reads this variable, so no overall
functional change.

Changes to the flights are as follows.  On these branches:
        osstest
	xen-4.8-testing
	xen-4.9-testing
	xen-unstable
	xen-unstable-smoke
in these jobs:
	build-amd64    build-amd64-xsm
	build-arm64    build-arm64-xsm
	build-armhf    build-armhf-xsm
	build-i386     build-i386-xsm
add the runvar setting `enable_livepatch=true'.

Signed-off-by: Konrad Rzeszutek Wilk <[e-mail]>
Signed-off-by: Ian Jackson <[e-mail]>

---
v3: New patch
v4: Regularise branch_wants_livepatch exit status
      (shell functions return 0 for true and non-0 for false).
    Use the `livepatch_runvars' pattern, so that we do not add
      enable_livepatch=false to any jobs.
    Enable livepatch testing on osstest branch and disable it
      on all other non-Xen branches.
    Rewrote commit message.

Signed-off-by: Ian Jackson <[e-mail]>
---
 mfi-common | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

Patch

diff --git a/mfi-common b/mfi-common
index ec31e2e..7b1e60c 100644
--- a/mfi-common
+++ b/mfi-common
@@ -76,6 +76,23 @@  branch_wants_xtf_tests () {
   esac
 }
 
+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-*)      return 0;;
+    osstest*)   return 0;;
+    *)          return 1;;
+  esac
+}
+
 job_create_build () {
   job_create_build_filter_callback "$@" || return 0
 
@@ -104,6 +121,7 @@  create_build_jobs () {
   local want_xend build_defxend build_extraxend
   local enable_ovmf
   local build_hostflags
+  local livepatch_runvars
 
   if [ "x$BUILD_LVEXTEND_MAX" != x ]; then
      BUILD_RUNVARS+=" build_lvextend_max=$BUILD_LVEXTEND_MAX "
@@ -197,6 +215,9 @@  create_build_jobs () {
         fi
     fi
 
+    if branch_wants_livepatch; then
+       livepatch_runvars='enable_livepatch=true'
+    fi
     eval "
         arch_runvars=\"\$ARCH_RUNVARS_$arch\"
     "
@@ -211,7 +232,7 @@  create_build_jobs () {
       fi
       job_create_build build-$arch$xsm_suffix build                          \
                 arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf\
-                enable_xsm=$enable_xsm                                       \
+                enable_xsm=$enable_xsm $livepatch_runvars		     \
         tree_qemu=$TREE_QEMU                                                 \
         tree_qemuu=$TREE_QEMU_UPSTREAM                                       \
         tree_xen=$TREE_XEN                                                   \
@@ -239,7 +260,7 @@  create_build_jobs () {
         # $REVISION_PREVXEN.
         job_create_build build-$arch-prev build                       \
                     arch=$arch enable_xend=false enable_ovmf=$enable_prevovmf\
-                    enable_xsm=false                                         \
+                    enable_xsm=false $livepatch_runvars                      \
             tree_xen=$TREE_XEN                                               \
                     $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
                     $hostos_runvars                                          \