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 OSSTEST v2 05/12] mfi-common: Always add debian_suite to debian_runvars
Date: Mon, 18 Jan 2016 14:28:50 +0000 [thread overview]
Message-ID: <1453127337-16136-5-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1453127319.6020.156.camel@citrix.com>
This adds an explicit debian_suite to some jobs which didn't already
have one, meaning that those jobs will remain the same when cloned for
a bisect and run in a tree where $c{DebianGuestSuite} has changed
since the original construction.
No expected semantic change.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Replaces "make-*flight: Abolish $defsuite and $guestdefsuite",
just always set debian_suite.
@@ -444,13 +444,42 @@
xen-unstable test-amd64-amd64-xl-pvh-intel debian_pvh 1
xen-unstable test-amd64-amd64-amd64-pvgrub debian_suite jessie
xen-unstable test-amd64-amd64-i386-pvgrub debian_suite jessie
+xen-unstable test-amd64-amd64-libvirt debian_suite jessie
+xen-unstable test-amd64-amd64-libvirt-pair debian_suite jessie
xen-unstable test-amd64-amd64-libvirt-vhd debian_suite jessie
+xen-unstable test-amd64-amd64-libvirt-xsm debian_suite jessie
+xen-unstable test-amd64-amd64-migrupgrade debian_suite jessie
+xen-unstable test-amd64-amd64-pair debian_suite jessie
xen-unstable test-amd64-amd64-pygrub debian_suite jessie
+xen-unstable test-amd64-amd64-xl debian_suite jessie
+xen-unstable test-amd64-amd64-xl-credit2 debian_suite jessie
+xen-unstable test-amd64-amd64-xl-multivcpu debian_suite jessie
+xen-unstable test-amd64-amd64-xl-pvh-amd debian_suite jessie
+xen-unstable test-amd64-amd64-xl-pvh-intel debian_suite jessie
xen-unstable test-amd64-amd64-xl-qcow2 debian_suite jessie
+xen-unstable test-amd64-amd64-xl-rtds debian_suite jessie
+xen-unstable test-amd64-amd64-xl-xsm debian_suite jessie
+xen-unstable test-amd64-i386-libvirt debian_suite jessie
+xen-unstable test-amd64-i386-libvirt-pair debian_suite jessie
+xen-unstable test-amd64-i386-libvirt-xsm debian_suite jessie
+xen-unstable test-amd64-i386-migrupgrade debian_suite jessie
+xen-unstable test-amd64-i386-pair debian_suite jessie
+xen-unstable test-amd64-i386-xl debian_suite jessie
xen-unstable test-amd64-i386-xl-raw debian_suite jessie
+xen-unstable test-amd64-i386-xl-xsm debian_suite jessie
+xen-unstable test-armhf-armhf-libvirt debian_suite jessie
xen-unstable test-armhf-armhf-libvirt-qcow2 debian_suite jessie
xen-unstable test-armhf-armhf-libvirt-raw debian_suite jessie
+xen-unstable test-armhf-armhf-libvirt-xsm debian_suite jessie
+xen-unstable test-armhf-armhf-xl debian_suite jessie
+xen-unstable test-armhf-armhf-xl-arndale debian_suite jessie
+xen-unstable test-armhf-armhf-xl-credit2 debian_suite jessie
+xen-unstable test-armhf-armhf-xl-cubietruck debian_suite jessie
+xen-unstable test-armhf-armhf-xl-midway debian_suite jessie
+xen-unstable test-armhf-armhf-xl-multivcpu debian_suite jessie
+xen-unstable test-armhf-armhf-xl-rtds debian_suite jessie
xen-unstable test-armhf-armhf-xl-vhd debian_suite jessie
+xen-unstable test-armhf-armhf-xl-xsm debian_suite jessie
xen-unstable test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm debianhvm_image debian-8.2.0-amd64-CD-1.iso
xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64 debianhvm_image debian-8.2.0-amd64-CD-1.iso
xen-unstable test-amd64-amd64-xl-qemut-debianhvm-amd64-xsm debianhvm_image debian-8.2.0-amd64-CD-1.iso
---
mfi-common | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mfi-common b/mfi-common
index 0e2b64f..1fcdb98 100644
--- a/mfi-common
+++ b/mfi-common
@@ -351,7 +351,7 @@ usual_debianhvm_image () {
# Provides various convenience variables for the callback.
#
test_matrix_iterate () {
- local hostos_runvars
+ local suite guestsuite hostos_runvars
case "$xenbranch" in
xen-3.*-testing) pairtoolstack=xend ;;
@@ -431,10 +431,10 @@ test_matrix_iterate () {
arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
"
- debian_runvars="debian_kernkind=$kernkind debian_arch=$dom0arch"
- if [ $guestsuite != $defguestsuite ] ; then
- debian_runvars="$debian_runvars debian_suite=$guestsuite"
- fi
+ debian_runvars="debian_kernkind=$kernkind \
+ debian_arch=$dom0arch \
+ debian_suite=$guestsuite \
+ "
most_hostflags="arch-$dom0arch,arch-xen-$xenarch,suite-$suite,purpose-test"
if [ "x$min_linux_hostflag" != "x" ] ; then
--
2.6.1
next prev parent reply other threads:[~2016-01-18 14:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-18 14:28 [PATCH OSSTEST v2 00/12] Specify host and guest os version in runvars Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 01/12] Debian: Abolish $suite and $xopts{Suite} from preseed_* interfaces Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 02/12] target_var: Support fallback to all_(guest|host)_$vn Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 03/12] mfi-common: Rename $suite_runvars as $hostos_runvars Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 04/12] mfi-common: always add host suite to hostos_runvars Ian Campbell
2016-01-18 14:28 ` Ian Campbell [this message]
2016-01-19 13:36 ` [PATCH OSSTEST v2 05/12] mfi-common: Always add debian_suite to debian_runvars Ian Jackson
2016-01-18 14:28 ` [PATCH OSSTEST v2 06/12] ts-host-install: Support DiVersion coming from runvars Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 07/12] ts-debian-di-install: Allow Di Version to come " Ian Campbell
2016-01-19 13:37 ` Ian Jackson
2016-01-18 14:28 ` [PATCH OSSTEST v2 08/12] make-flight: Set di_version runvar on d-i based test jobs Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 09/12] mfi-common: Set di_version for build & test host install Ian Campbell
2016-01-19 13:38 ` Ian Jackson
2016-01-18 14:28 ` [PATCH OSSTEST v2 10/12] Qualify TftpDiVersion with the suite Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 11/12] mfi-common: usual_debianhvm_image: derive version from $guestsuite Ian Campbell
2016-01-18 14:28 ` [PATCH OSSTEST v2 12/12] make-flight: Use older Debian for host and guest OS with older Xen Ian Campbell
2016-01-19 13:39 ` 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=1453127337-16136-5-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).