diff mbox

[OSSTEST,v2,18/19] make-flight: don't test pvgrub for Xen XXX

Message ID 20171031135203.11537-19-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu Oct. 31, 2017, 1:52 p.m. UTC
XXX Need to pin down the version of Xen when the upgrade to stretch is
complete because osstest configuration is branched for each version.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 make-flight | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Wei Liu Nov. 3, 2017, 2:06 p.m. UTC | #1
These are extra patches to replace

    make-flight: don't test pvgrub for Xen XXX

so that we can keep pvgrub tests.

See
http://logs.test-lab.xenproject.org/osstest/logs/115518/


Wei Liu (2):
  ts-debian-di-install: use gho to pick d-i
  make-flight: guest should use jessie to test pvgrub

 make-flight          | 8 ++++----
 ts-debian-di-install | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/make-flight b/make-flight
index 76620c1..b0f1e69 100755
--- a/make-flight
+++ b/make-flight
@@ -827,7 +827,22 @@  test_matrix_do_one () {
   #do_passthrough_tests
 
   do_pygrub_tests
-  do_pvgrub_tests
+
+  # pvgrub1 tests for version < XXX only
+  case "$xenbranch" in
+  xen-4.3-testing) test_pvgrub=y ;;
+  xen-4.4-testing) test_pvgrub=y ;;
+  xen-4.5-testing) test_pvgrub=y ;;
+  xen-4.6-testing) test_pvgrub=y ;;
+  xen-4.7-testing) test_pvgrub=y ;;
+  xen-4.8-testing) test_pvgrub=y ;;
+  xen-4.9-testing) test_pvgrub=y ;;
+  *)               test_pvgrub=n ;;
+  esac
+
+  if [ x$test_pvgrub = xy ]; then
+      do_pvgrub_tests
+  fi
 
   do_xtf_tests
   do_livepatch_tests