make-flight: Test with `sched=credit'

The default in xen-unstable#staging is soon to be sched=credit2.  That
leaves osstest not testing credit1 at all.

Add a job that does this.  It's a copy of the -credit2 job.  (It's
a pretty nugatory test but it will probably do.)

We call the test -credit1, although the Xen parameter is =credit.

I have verified with standalone-generate-dump-flight-runvars that the
effect is to add the appropriately mutated copy of the credit2 job to
every flight.  The mutations are solely the sched= parameter and the
job name.

CC: George Dunlap <george.dunlap@citrix.com>
CC: Dario Faggioli <dfaggioli@suse.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Tim Deegan <tim@xen.org>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/make-flight b/make-flight
index 96c261b5aef43bb08da771b0a0423c2e18099600..93c82a214901115cab62def7958e33aec3d51f04 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -493,15 +493,19 @@ do_hvm_rhel6_tests () {
   done
 }
 
-do_credit2_tests () {
+do_credit12_tests () {
   if [ $xenarch != $dom0arch ]; then
     return
   fi
 
-  job_create_test test-$xenarch$kern-$dom0arch-xl-credit2             \
+  for c in credit1:credit credit2:credit2; do
+
+  job_create_test test-$xenarch$kern-$dom0arch-xl-${c%:*}            \
        test-debian xl $xenarch $dom0arch                              \
-            guests_vcpus=4 xen_boot_append='sched=credit2'            \
+            guests_vcpus=4 xen_boot_append="sched=${c#*:}"            \
             $debian_runvars all_hostflags=$most_hostflags
+
+  done
 }
 
 do_rtds_tests () {
@@ -730,7 +734,7 @@ test_matrix_do_one () {
   esac
 
   do_rtds_tests
-  do_credit2_tests
+  do_credit12_tests
 
   do_examine_one