From patchwork Wed Jun 7 17:48:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9772103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 34B376034B for ; Wed, 7 Jun 2017 17:52:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48B302843F for ; Wed, 7 Jun 2017 17:52:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D79F284D4; Wed, 7 Jun 2017 17:52:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E11242843F for ; Wed, 7 Jun 2017 17:52:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIf5r-0002qr-Hb; Wed, 07 Jun 2017 17:50:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIf5p-0002oB-U4 for xen-devel@lists.xenproject.org; Wed, 07 Jun 2017 17:50:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E9/26-02183-DCC38395; Wed, 07 Jun 2017 17:50:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKIsWRWlGSWpSXmKPExsXitHRDpO5JG4t Ig5cPFS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oz93y8xF9yRrjhz7DhLA+MdoS5GTg4JAX+J w38+sIDYbAK6Ek1b/rJ1MXJwiAioSNzea9DFyMXBLLCRUeLBojvsIDXCAvESdw7+YQSxWYBqO u7vAbN5BTwlDh/cyAoxU07i/PGfzCA2p4CXxPZX59lAbCGgmj2f/4HNFxJQk5i7Ph6iVVDi5M wnYCcwC0hIHHzxgnkCI+8sJKlZSFILGJlWMaoXpxaVpRbpGuklFWWmZ5TkJmbm6BoamOrlphY XJ6an5iQmFesl5+duYgQGDgMQ7GD8/sfpEKMkB5OSKO8DaYtIIb6k/JTKjMTijPii0pzU4kOM MhwcShK8zMBAFBIsSk1PrUjLzAGGMExagoNHSYSXEyTNW1yQmFucmQ6ROsVozLFh9fovTBxzf u/4wiTEkpeflyolzrvNGqhUAKQ0ozQPbhAsti4xykoJ8zICnSbEU5BalJtZgir/ilGcg1FJGG IhT2ZeCdy+V0CnMAGdwnfJBOSUkkSElFQDo8UvkY5ZX77vyDHZdOGnwuN3QSc5hBOdpnc9kp0 xa3pO3q0T9d0y007sSUqc7DRp6pkEhaYTvT+fzKzdf2hGznelNZcq79sF9P312tcY1Lr7pdyG r3/zPp/x/ld18tp+YTVrwQW3NeOWJGZfnhbhbdFw6OarqwXuc9MMcj/fjq38v4yzpPX1t14ll uKMREMt5qLiRAA4ytP6qAIAAA== X-Env-Sender: prvs=3243fba83=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1496857798!102188259!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3724 invoked from network); 7 Jun 2017 17:50:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jun 2017 17:50:01 -0000 X-IronPort-AV: E=Sophos;i="5.39,311,1493683200"; d="scan'208";a="426953395" From: Ian Jackson To: Date: Wed, 7 Jun 2017 18:48:55 +0100 Message-ID: <1496857742-20191-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496857742-20191-1-git-send-email-ian.jackson@eu.citrix.com> References: <1496857742-20191-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 04/11] mfi-common: Add an enable_livepatch runvar to the Xen build jobs X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Konrad Rzeszutek Wilk 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 Signed-off-by: Ian Jackson --- 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 --- 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 \