From: Richard W.M. Jones Date: Thu, 3 Sep 2015 19:10:11 +0000 (+0100) Subject: Add test_plan.guest_clock to all tests. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8a001b6a548b9b1bfd868472c536ea543aa49fe2;p=virt-v2v-test-cases-nonfree.git Add test_plan.guest_clock to all tests. Run all tests in a predictable date environment, starting on 2014-01-01. This prevents Windows from trying reactivation. This requires libguestfs >= 1.31.4. --- diff --git a/rhel5xen-rhel/rhel_45_i386_fv.ml b/rhel5xen-rhel/rhel_45_i386_fv.ml index 3b69142..a51ee59 100644 --- a/rhel5xen-rhel/rhel_45_i386_fv.ml +++ b/rhel5xen-rhel/rhel_45_i386_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_45_i386_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_45_i386_pv.ml b/rhel5xen-rhel/rhel_45_i386_pv.ml index 0559722..b27fb4a 100644 --- a/rhel5xen-rhel/rhel_45_i386_pv.ml +++ b/rhel5xen-rhel/rhel_45_i386_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_45_i386_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-login.ppm"); } diff --git a/rhel5xen-rhel/rhel_45_x86_64_fv.ml b/rhel5xen-rhel/rhel_45_x86_64_fv.ml index 0a6a6cd..069d2dc 100644 --- a/rhel5xen-rhel/rhel_45_x86_64_fv.ml +++ b/rhel5xen-rhel/rhel_45_x86_64_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_45_x86_64_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_45_x86_64_pv.ml b/rhel5xen-rhel/rhel_45_x86_64_pv.ml index be2c59b..c2643c8 100644 --- a/rhel5xen-rhel/rhel_45_x86_64_pv.ml +++ b/rhel5xen-rhel/rhel_45_x86_64_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_45_x86_64_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-login.ppm"); boot_known_good_screenshots = [ diff --git a/rhel5xen-rhel/rhel_49_i386_fv.ml b/rhel5xen-rhel/rhel_49_i386_fv.ml index 9e40b90..bfc2703 100644 --- a/rhel5xen-rhel/rhel_49_i386_fv.ml +++ b/rhel5xen-rhel/rhel_49_i386_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_49_i386_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_49_i386_pv.ml b/rhel5xen-rhel/rhel_49_i386_pv.ml index 3d0c778..3afeaa9 100644 --- a/rhel5xen-rhel/rhel_49_i386_pv.ml +++ b/rhel5xen-rhel/rhel_49_i386_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_49_i386_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-login.ppm"); } diff --git a/rhel5xen-rhel/rhel_49_x86_64_fv.ml b/rhel5xen-rhel/rhel_49_x86_64_fv.ml index f3d3eff..21f947b 100644 --- a/rhel5xen-rhel/rhel_49_x86_64_fv.ml +++ b/rhel5xen-rhel/rhel_49_x86_64_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_49_x86_64_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_49_x86_64_pv.ml b/rhel5xen-rhel/rhel_49_x86_64_pv.ml index 0ee0979..391ad00 100644 --- a/rhel5xen-rhel/rhel_49_x86_64_pv.ml +++ b/rhel5xen-rhel/rhel_49_x86_64_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_49_x86_64_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-login.ppm"); } diff --git a/rhel5xen-rhel/rhel_511_i386_fv.ml b/rhel5xen-rhel/rhel_511_i386_fv.ml index f0da57d..2080fff 100644 --- a/rhel5xen-rhel/rhel_511_i386_fv.ml +++ b/rhel5xen-rhel/rhel_511_i386_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_511_i386_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_511_i386_pv.ml b/rhel5xen-rhel/rhel_511_i386_pv.ml index d7127cc..75ef77a 100644 --- a/rhel5xen-rhel/rhel_511_i386_pv.ml +++ b/rhel5xen-rhel/rhel_511_i386_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_511_i386_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but there is a (harmless?) error * on the login page: * INIT: Id "co" respawning too fast: disabled for 5 minutes diff --git a/rhel5xen-rhel/rhel_511_x86_64_fv.ml b/rhel5xen-rhel/rhel_511_x86_64_fv.ml index aec51b0..9d2d6d5 100644 --- a/rhel5xen-rhel/rhel_511_x86_64_fv.ml +++ b/rhel5xen-rhel/rhel_511_x86_64_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_511_x86_64_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/rhel5xen-rhel/rhel_511_x86_64_pv.ml b/rhel5xen-rhel/rhel_511_x86_64_pv.ml index 6bf35fe..a92b861 100644 --- a/rhel5xen-rhel/rhel_511_x86_64_pv.ml +++ b/rhel5xen-rhel/rhel_511_x86_64_pv.ml @@ -4,6 +4,7 @@ let test = "rhel_511_x86_64_pv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but there is a (harmless?) error * on the login page: * INIT: Id "co" respawning too fast: disabled for 5 minutes diff --git a/rhel5xen-rhel/rhel_66_x86_64_fv.ml b/rhel5xen-rhel/rhel_66_x86_64_fv.ml index e638def..3d9a9f6 100644 --- a/rhel5xen-rhel/rhel_66_x86_64_fv.ml +++ b/rhel5xen-rhel/rhel_66_x86_64_fv.ml @@ -4,6 +4,7 @@ let test = "rhel_66_x86_64_fv" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-login.ppm") } diff --git a/vmware-rhel/rhel_511_x86_64_no_tools.ml b/vmware-rhel/rhel_511_x86_64_no_tools.ml index bd3717c..d032867 100644 --- a/vmware-rhel/rhel_511_x86_64_no_tools.ml +++ b/vmware-rhel/rhel_511_x86_64_no_tools.ml @@ -5,6 +5,7 @@ let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (* XXX It boots fine, but X11 fails to start. Probably we need to * install the X11 QXL driver. *) diff --git a/vmware-rhel/rhel_66_x86_64_no_tools.ml b/vmware-rhel/rhel_66_x86_64_no_tools.ml index be8c911..640fa74 100644 --- a/vmware-rhel/rhel_66_x86_64_no_tools.ml +++ b/vmware-rhel/rhel_66_x86_64_no_tools.ml @@ -4,6 +4,7 @@ let test = "rhel_66_x86_64_no_tools" let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ ".ppm") } diff --git a/vmware-rhel/rhel_71_x86_64_no_tools.ml b/vmware-rhel/rhel_71_x86_64_no_tools.ml index c7df280..cae25dc 100644 --- a/vmware-rhel/rhel_71_x86_64_no_tools.ml +++ b/vmware-rhel/rhel_71_x86_64_no_tools.ml @@ -4,6 +4,7 @@ let test = "rhel_71_x86_64_no_tools" let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ ".ppm") } diff --git a/vmware-uefi/rhel_71_x86_64_uefi.ml b/vmware-uefi/rhel_71_x86_64_uefi.ml index f2afa4d..412fdcc 100644 --- a/vmware-uefi/rhel_71_x86_64_uefi.ml +++ b/vmware-uefi/rhel_71_x86_64_uefi.ml @@ -4,6 +4,7 @@ let test = "rhel_71_x86_64_uefi" let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (*boot_plan = Boot_to_screenshot (test ^ ".ppm")*) boot_plan = Boot_to_idle } diff --git a/vmware-uefi/win_2012r2_x86_64_uefi.ml b/vmware-uefi/win_2012r2_x86_64_uefi.ml index 909ee37..f8b1de5 100644 --- a/vmware-uefi/win_2012r2_x86_64_uefi.ml +++ b/vmware-uefi/win_2012r2_x86_64_uefi.ml @@ -5,6 +5,7 @@ let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; (*boot_plan = Boot_to_screenshot (test ^ ".ppm")*) boot_plan = Boot_to_idle } diff --git a/vmware-win/win_2003r2_x86_64_no_tools.ml b/vmware-win/win_2003r2_x86_64_no_tools.ml index 3e88032..c3b0538 100644 --- a/vmware-win/win_2003r2_x86_64_no_tools.ml +++ b/vmware-win/win_2003r2_x86_64_no_tools.ml @@ -5,6 +5,7 @@ let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ ".ppm") } diff --git a/vmware-win/win_7_x86_64_no_tools.ml b/vmware-win/win_7_x86_64_no_tools.ml index 99bf93c..2e28420 100644 --- a/vmware-win/win_7_x86_64_no_tools.ml +++ b/vmware-win/win_7_x86_64_no_tools.ml @@ -5,6 +5,7 @@ let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ ".ppm") } diff --git a/vmware-win/win_xpsp3_i386_no_tools.ml b/vmware-win/win_xpsp3_i386_no_tools.ml index 880bd83..e119eae 100644 --- a/vmware-win/win_xpsp3_i386_no_tools.ml +++ b/vmware-win/win_xpsp3_i386_no_tools.ml @@ -5,6 +5,7 @@ let input_disk = test ^ ".ova" let test_plan = { default_plan with + guest_clock = new_year's_day 2014; boot_plan = Boot_to_screenshot (test ^ "-desktop.ppm"); boot_known_good_screenshots = [ test ^ "-booting.ppm" ]; } diff --git a/windows-virtio/win_2012r2_x86_64.ml b/windows-virtio/win_2012r2_x86_64.ml index 79de7af..7d0c213 100644 --- a/windows-virtio/win_2012r2_x86_64.ml +++ b/windows-virtio/win_2012r2_x86_64.ml @@ -14,6 +14,7 @@ let check_virtio_blk g root xml = let test_plan = { default_plan with + guest_clock = new_year's_day 2014; post_conversion_test = Some check_virtio_blk; boot_plan = Boot_to_screenshot (test ^ "-login.ppm") } diff --git a/windows-virtio/win_81pro_x86_64.ml b/windows-virtio/win_81pro_x86_64.ml index 47c03b6..2e47c5a 100644 --- a/windows-virtio/win_81pro_x86_64.ml +++ b/windows-virtio/win_81pro_x86_64.ml @@ -14,6 +14,7 @@ let check_virtio_blk g root xml = let test_plan = { default_plan with + guest_clock = new_year's_day 2014; post_conversion_test = Some check_virtio_blk; boot_plan = Boot_to_screenshot (test ^ "-login.ppm"); }