From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v8 06/14] Test pygrub and pvgrub on the regular flights Date: Wed, 8 Jul 2015 13:30:54 +0100 Message-ID: <1436358662-12886-6-git-send-email-ian.campbell@citrix.com> References: <1436358648.23508.32.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436358648.23508.32.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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 adds three new jobs: +test-amd64-amd64-amd64-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test +test-amd64-amd64-amd64-pvgrub arch amd64 +test-amd64-amd64-amd64-pvgrub buildjob build-amd64 +test-amd64-amd64-amd64-pvgrub debian_arch amd64 +test-amd64-amd64-amd64-pvgrub debian_bootloader pvgrub +test-amd64-amd64-amd64-pvgrub debian_method netboot +test-amd64-amd64-amd64-pvgrub debian_suite wheezy +test-amd64-amd64-amd64-pvgrub kernbuildjob build-amd64-pvops +test-amd64-amd64-amd64-pvgrub kernkind pvops +test-amd64-amd64-amd64-pvgrub toolstack xl +test-amd64-amd64-amd64-pvgrub xenbuildjob build-amd64 +test-amd64-amd64-i386-pvgrub all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test +test-amd64-amd64-i386-pvgrub arch amd64 +test-amd64-amd64-i386-pvgrub buildjob build-amd64 +test-amd64-amd64-i386-pvgrub debian_arch i386 +test-amd64-amd64-i386-pvgrub debian_bootloader pvgrub +test-amd64-amd64-i386-pvgrub debian_method netboot +test-amd64-amd64-i386-pvgrub debian_suite wheezy +test-amd64-amd64-i386-pvgrub kernbuildjob build-amd64-pvops +test-amd64-amd64-i386-pvgrub kernkind pvops +test-amd64-amd64-i386-pvgrub toolstack xl +test-amd64-amd64-i386-pvgrub xenbuildjob build-amd64 +test-amd64-amd64-pygrub all_hostflags arch-amd64,arch-xen-amd64,suite-wheezy,purpose-test +test-amd64-amd64-pygrub arch amd64 +test-amd64-amd64-pygrub buildjob build-amd64 +test-amd64-amd64-pygrub debian_arch amd64 +test-amd64-amd64-pygrub debian_bootloader pygrub +test-amd64-amd64-pygrub debian_method netboot +test-amd64-amd64-pygrub debian_suite wheezy +test-amd64-amd64-pygrub kernbuildjob build-amd64-pvops +test-amd64-amd64-pygrub kernkind pvops +test-amd64-amd64-pygrub toolstack xl +test-amd64-amd64-pygrub xenbuildjob build-amd64 Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v7: Use {Guest}_suite not {Guest}_dist as runvar to choose version. Refreshed runvars i ncommit message. v3: added runvar details --- make-flight | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/make-flight b/make-flight index de8393a..725da26 100755 --- a/make-flight +++ b/make-flight @@ -325,6 +325,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_suite=$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_suite=$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_suite=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pvgrub \ + all_hostflags=$most_hostflags +} + do_pv_debian_tests () { xsms=$(xenbranch_xsm_variants) @@ -473,6 +509,9 @@ test_matrix_do_one () { fi #do_passthrough_tests + + do_pygrub_tests + do_pvgrub_tests } test_matrix_iterate -- 2.1.4