xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 04/11] mfi-common: Add an enable_livepatch runvar to the Xen build jobs
Date: Wed, 7 Jun 2017 18:48:55 +0100	[thread overview]
Message-ID: <1496857742-20191-5-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1496857742-20191-1-git-send-email-ian.jackson@eu.citrix.com>

From: Konrad Rzeszutek Wilk <konrad@kernel.org>

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 <konrad@kernel.org>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

---
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 <Ian.Jackson@eu.citrix.com>
---
 mfi-common | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

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                                          \
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

  parent reply	other threads:[~2017-06-07 17:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-07 17:48 [OSSTEST PATCH v4 00/11] livepatch test support Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 01/11] TestSupport: target_cmd_root_status: New sub which returns return code Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 02/11] TestSupport: target_cmd_*: Add some doc comments Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 03/11] TestSupport: target_cmd_output_root_status: New sub Ian Jackson
2017-06-07 17:48 ` Ian Jackson [this message]
2017-06-07 17:48 ` [OSSTEST PATCH 05/11] ts-xen-build: Build livepatches test-cases Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 06/11] ts-livepatch: Initial test-cases Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 07/11] sg-run-job: Add the test-livepatch Ian Jackson
2017-06-07 17:48 ` [OSSTEST PATCH 08/11] make-flight: Add livepatch build/test target in the matrix Ian Jackson
2017-06-07 17:49 ` [OSSTEST PATCH 09/11] PDU/lab: Similar to xenuse Ian Jackson
2017-06-07 17:49 ` [OSSTEST PATCH 10/11] cs-adjust-flight: Rework runvar-build-set new value handling Ian Jackson
2017-06-07 17:49 ` [OSSTEST PATCH 11/11] sg-check-tested: Provide --flight option Ian Jackson
2017-06-07 18:54 ` [OSSTEST PATCH v4 00/11] livepatch test support Ian Jackson
2017-06-08  0:50 ` Konrad Rzeszutek Wilk
2017-06-09 11:01   ` Ian Jackson
2017-06-11  0:19     ` Konrad Rzeszutek Wilk
2017-06-09 14:35   ` Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1496857742-20191-5-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).