| Message ID | 1398681696-2773-13-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | New |
| Headers | show |
Ian Campbell writes ("[PATCH OSSTEST v2 13/15] Test pygrub and pvgrub on the regular flights"):
> Since we now have the ability to test these drop one of each of
> pygrub, pvgrub-32 and pvgrub-64 into the standard flights. Omitting
> the {Guest}_diver runvar causes ts-debian-di-install to use the d-i
> images in the location configured via TftpDiVersion, so they are
> version controlled along with the d-i version used for the host.
This looks plausible. But can you show the mg-show-flight-runvars
diff ?
Thanks,
Ian.
On Fri, 2014-05-02 at 15:02 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH OSSTEST v2 13/15] Test pygrub and pvgrub on the regular flights"): > > Since we now have the ability to test these drop one of each of > > pygrub, pvgrub-32 and pvgrub-64 into the standard flights. Omitting > > the {Guest}_diver runvar causes ts-debian-di-install to use the d-i > > images in the location configured via TftpDiVersion, so they are > > version controlled along with the d-i version used for the host. > > This looks plausible. But can you show the mg-show-flight-runvars > diff ? Will do in the next post.
diff --git a/make-flight b/make-flight index aadf58b..c4ddbc4 100755 --- a/make-flight +++ b/make-flight @@ -233,6 +233,42 @@ do_passthrough_tests () { done } +do_pygrub_tests () { + if [ $xenarch != amd64 -o $dom0arch != amd64 -o "$kern" != "" ]; then + return + fi + + job_create_test test-$xenarch$kern-$dom0arch-pygrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=amd64 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pygrub \ + all_hostflags=$most_hostflags +} + +do_pvgrub_tests () { + if [ $xenarch != amd64 -o $dom0arch != amd64 -o "$kern" != "" ]; then + return + fi + + job_create_test test-$xenarch$kern-$dom0arch-amd64-pvgrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=amd64 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pvgrub \ + all_hostflags=$most_hostflags \ + + job_create_test test-$xenarch$kern-$dom0arch-i386-pvgrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=i386 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pvgrub \ + all_hostflags=$most_hostflags +} + test_matrix_do_one () { # Basic PV Linux test with xl @@ -315,6 +351,9 @@ test_matrix_do_one () { fi do_passthrough_tests + + do_pygrub_tests + do_pvgrub_tests } test_matrix_iterate
Since we now have the ability to test these drop one of each of pygrub, pvgrub-32 and pvgrub-64 into the standard flights. Omitting the {Guest}_diver runvar causes ts-debian-di-install to use the d-i images in the location configured via TftpDiVersion, so they are version controlled along with the d-i version used for the host. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- make-flight | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)