| Message ID | 1453127337-16136-12-git-send-email-ian.campbell@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ian Campbell writes ("[PATCH OSSTEST v2 12/12] make-flight: Use older Debian for host and guest OS with older Xen"):
> Sometimes when updating osstest to use a newer version of Debian as a
> baseline we find that the new compiler or other tools pickup latent
> errors in older code bases for which the fixes are invasive or
> otherwise inappropriate for a stable branch.
>
> This is the case with Debian Jessie and Xen 4.3 and earlier, so
> restrict those branches to keep using Wheezy.
>
> This only applies to xen-X.Y-testing branches and
> qemu-upstream-X.Y-testing branches since other branch all use
> xen-unstable as their Xen.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff --git a/make-flight b/make-flight index 885870c..8acfcb9 100755 --- a/make-flight +++ b/make-flight @@ -31,8 +31,21 @@ flight=`./cs-flight-create $blessing $branch` . ./ap-common . ./mfi-common -defsuite=`getconfig DebianSuite` -defguestsuite=`getconfig GuestDebianSuite` +# Older versions of Xen may not build with the current default. Note +# that branches older than 4.3 might need something even older than +# Wheezy, but we have not done the archaeology to figure out what they +# require. +case "$xenbranch" in + xen-3.*-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.0-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.1-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.2-testing) defsuite="wheezy"; defguestsuite="wheezy";; + xen-4.3-testing) defsuite="wheezy"; defguestsuite="wheezy";; + *) + defsuite=`getconfig DebianSuite` + defguestsuite=`getconfig GuestDebianSuite` + ;; +esac # Pick default Debian Installer version to correspond to the chosen # suite.
Sometimes when updating osstest to use a newer version of Debian as a baseline we find that the new compiler or other tools pickup latent errors in older code bases for which the fixes are invasive or otherwise inappropriate for a stable branch. This is the case with Debian Jessie and Xen 4.3 and earlier, so restrict those branches to keep using Wheezy. This only applies to xen-X.Y-testing branches and qemu-upstream-X.Y-testing branches since other branch all use xen-unstable as their Xen. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- v2: Cope with un-abolishing $defsuite and $defguestsuite. Dropped Ack. Runvar differences are of the form: -xen-4.3-testing build-amd64 all_host_di_version 2015-09-18 -xen-4.3-testing build-amd64 all_host_suite jessie +xen-4.3-testing build-amd64 all_host_di_version 2015-09-07 +xen-4.3-testing build-amd64 all_host_suite wheezy xen-4.3-testing build-amd64 arch amd64 -xen-4.3-testing build-amd64 host_hostflags share-build-jessie-amd64,arch-amd64,suite-jessie,purpose-build +xen-4.3-testing build-amd64 host_hostflags share-build-wheezy-amd64,arch-amd64,suite-wheezy,purpose-build Or for a test which uses d-i: -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_di_version 2015-09-18 -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-jessie,purpose-test -xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_suite jessie +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_di_version 2015-09-07 +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test +xen-4.3-testing test-amd64-amd64-amd64-pvgrub all_host_suite wheezy xen-4.3-testing test-amd64-amd64-amd64-pvgrub arch amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub buildjob build-amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_arch amd64 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_bootloader pvgrub -xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_di_version 2015-09-18 +xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_di_version 2015-09-07 xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_method netboot -xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_suite jessie +xen-4.3-testing test-amd64-amd64-amd64-pvgrub debian_suite wheezy xen-4.3-testing test-amd64-amd64-amd64-pvgrub kernbuildjob build-amd64-pvops xen-4.3-testing test-amd64-amd64-amd64-pvgrub kernkind pvops xen-4.3-testing test-amd64-amd64-amd64-pvgrub toolstack xl xen-4.3-testing test-amd64-amd64-amd64-pvgrub xenbuildjob build-amd64 --- make-flight | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)