From: Ian Campbell <ian.campbell@citrix.com>
To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH RFC OSSTEST v1 03/12] mfi-common: Rename $suite_runvars as $hostos_runvars
Date: Fri, 8 Jan 2016 14:29:50 +0000 [thread overview]
Message-ID: <1452263399-14094-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1452263368.29416.39.camel@citrix.com>
Later in the series more runvars to control the host install will be
added.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
mfi-common | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/mfi-common b/mfi-common
index b739c7d..ccf8a5b 100644
--- a/mfi-common
+++ b/mfi-common
@@ -80,7 +80,7 @@ create_build_jobs () {
local arch
local pvops_kernel pvops_kconfig_overrides
- local suite suite_runvars
+ local suite hostos_runvars
local want_xend build_defxend build_extraxend
local enable_ovmf
local build_hostflags
@@ -124,9 +124,9 @@ create_build_jobs () {
esac
if [ $suite != $defsuite ] ; then
- suite_runvars="host_suite=$suite"
+ hostos_runvars="host_suite=$suite"
else
- suite_runvars=
+ hostos_runvars=
fi
# In 4.4 onwards xend is off by default. If necessary we build a
@@ -192,7 +192,7 @@ create_build_jobs () {
tree_seabios=$TREE_SEABIOS \
tree_ovmf=$TREE_OVMF \
$RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
revision_xen=$REVISION_XEN \
revision_qemu=$REVISION_QEMU \
@@ -214,7 +214,7 @@ create_build_jobs () {
enable_xsm=false \
tree_xen=$TREE_XEN \
$RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
revision_xen=$REVISION_PREVXEN
fi
@@ -226,7 +226,7 @@ create_build_jobs () {
tree_qemuu=$TREE_QEMU_UPSTREAM \
tree_xen=$TREE_XEN \
$RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
revision_xen=$REVISION_XEN \
revision_qemu=$REVISION_QEMU \
@@ -236,7 +236,7 @@ create_build_jobs () {
job_create_build build-$arch-pvops build-kern \
arch=$arch kconfighow=xen-enable-xen-config \
$RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
$pvops_kernel $pvops_kconfig_overrides \
${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \
@@ -249,7 +249,7 @@ create_build_jobs () {
arch=$arch \
tree_xen=$TREE_XEN \
$RUNVARS $BUILD_RUNVARS $BUILD_LIBVIRT_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
buildjob=${bfi}build-$arch \
tree_libvirt=$TREE_LIBVIRT revision_libvirt=$REVISION_LIBVIRT\
@@ -264,7 +264,7 @@ create_build_jobs () {
arch=$arch \
tree_xen=$TREE_XEN \
$RUNVARS $BUILD_RUNVARS $BUILD_RUMPUSERXEN_RUNVARS $arch_runvars \
- $suite_runvars \
+ $hostos_runvars \
host_hostflags=$build_hostflags \
buildjob=${bfi}build-$arch \
tree_rumpuserxen=$TREE_RUMPUSERXEN \
@@ -293,7 +293,7 @@ create_build_jobs () {
arch=$arch kconfighow=create-config-sh \
kimagefile=vmlinux \
$RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \
- $arch_runvars $suite_runvars \
+ $arch_runvars $hostos_runvars \
host_hostflags=$build_hostflags \
tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg \
revision_linux=$REVISION_LINUX_OLD
@@ -355,6 +355,7 @@ usual_debianhvm_image () {
# Provides various convenience variables for the callback.
#
test_matrix_iterate () {
+ local hostos_runvars
case "$xenbranch" in
xen-3.*-testing) pairtoolstack=xend ;;
@@ -409,9 +410,9 @@ test_matrix_iterate () {
esac
if [ $suite != $defsuite ] ; then
- suite_runvars="host_suite=$suite"
+ hostos_runvars="host_suite=$suite"
else
- suite_runvars=
+ hostos_runvars=
fi
for kern in ''; do
@@ -452,7 +453,7 @@ test_matrix_iterate () {
arch=$dom0arch \
kernbuildjob=${bfi}build-$dom0arch-$kernbuild \
kernkind=$kernkind \
- $arch_runvars $suite_runvars
+ $arch_runvars $hostos_runvars
"
test_matrix_do_one
--
2.6.1
next prev parent reply other threads:[~2016-01-08 14:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 14:29 [PATCH RFC OSSTEST v1 00/12] Specify host and guest os version in runvars Ian Campbell
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 01/12] Debian: Abolish $suite and $xopts{Suite} from preseed_* interfaces Ian Campbell
2016-01-08 15:08 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 02/12] target_var: Support fallback to all_(guest|host)_$vn Ian Campbell
2016-01-08 15:10 ` Ian Jackson
2016-01-08 14:29 ` Ian Campbell [this message]
2016-01-08 15:10 ` [PATCH RFC OSSTEST v1 03/12] mfi-common: Rename $suite_runvars as $hostos_runvars Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 04/12] mfi-common: always add host suite to hostos_runvars Ian Campbell
2016-01-12 11:27 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 05/12] make-*flight: Abolish $defsuite and $guestdefsuite Ian Campbell
2016-01-12 14:18 ` Ian Jackson
2016-01-15 17:15 ` Ian Campbell
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 06/12] ts-host-install: Support DiVersion coming from runvars Ian Campbell
2016-01-12 14:19 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 07/12] ts-debian-di-install: Allow Di Version to come " Ian Campbell
2016-01-12 14:39 ` Ian Jackson
2016-01-15 16:33 ` Ian Campbell
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 08/12] make-flight: Set diversion runvar on d-i based test jobs Ian Campbell
2016-01-12 14:42 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 09/12] mfi-common: Set diversion for build & test host install Ian Campbell
2016-01-12 14:41 ` Ian Jackson
2016-01-15 17:36 ` Ian Campbell
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 10/12] Qualify TftpDiVersion with the suite Ian Campbell
2016-01-12 15:19 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 11/12] mfi-common: usual_debianhvm_image: derive version from $guestsuite Ian Campbell
2016-01-12 15:21 ` Ian Jackson
2016-01-08 14:29 ` [PATCH RFC OSSTEST v1 12/12] make-flight: Use older Debian for host and guest OS with older Xen Ian Campbell
2016-01-12 15:22 ` 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=1452263399-14094-3-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.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).