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 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 <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 804378c77c29fab919db032ec1c6fc9e358eaf09..0902619e643c4579ccf1aeb4bafeb19b23fbf4ac 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -329,6 +329,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)
 
@@ -477,6 +513,9 @@ test_matrix_do_one () {
 
   fi
   #do_passthrough_tests
+
+  do_pygrub_tests
+  do_pvgrub_tests
 }
 
 test_matrix_iterate