[PATCH OSSTEST 12/12] make-flight, mfi-common: create live migration test for libvirt

[Wei Liu <wei.liu2@citrix.com>]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 make-flight | 13 +++++++++++--
 mfi-common  |  6 +++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/make-flight b/make-flight
index 23d51ea..80c9c39 100755
--- a/make-flight
+++ b/make-flight
@@ -419,11 +419,20 @@ test_matrix_do_one () {
   done # qemuu_suffix
 
   # Test live migration
-  job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
-            $pairtoolstack $xenarch $dom0arch \
+  for toolstack in $pairtoolstack; do
+    # Don't change test case name for old test cases with xl and xend
+    if [ x$toolstack = xxl -o x$toolstack = xxend ]; then
+      toolstack_suffix=""
+    else
+      toolstack_suffix="-$toolstack"
+    fi
+    job_create_test test-$xenarch$kern-$dom0arch$toolstack_suffix-pair \
+            test-pair \
+            $toolstack $xenarch $dom0arch \
             !host !host_hostflags \
             $debian_runvars \
             all_hostflags=$most_hostflags,equiv-1
+  done
 
   if [ x$test_pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then
 
diff --git a/mfi-common b/mfi-common
index 8e53fbb..8ad6450 100644
--- a/mfi-common
+++ b/mfi-common
@@ -312,7 +312,11 @@ test_matrix_iterate () {
   xen-3.*-testing)      pairtoolstack=xend ;;
   xen-4.0-testing)      pairtoolstack=xend ;;
   xen-4.1-testing)      pairtoolstack=xend ;;
-  *)                    pairtoolstack=xl ;;
+  xen-4.2-testing)      pairtoolstack=xl ;;
+  xen-4.3-testing)      pairtoolstack=xl ;;
+  xen-4.4-testing)      pairtoolstack=xl ;;
+  xen-4.5-testing)      pairtoolstack=xl ;;
+  *)                    pairtoolstack="xl libvirt" ;;
   esac
 
   for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
-- 
1.9.1