FreeBSD: Update FreeBSD guests to 10.1

Update FreeBSD guests in OSSTest to FreeBSD 10.1. The following images
should be placed in the osstest images folder:

ftp://ftp.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/10.1-RELEASE/amd64/Latest/FreeBSD-10.1-RELEASE-amd64.raw.xz
ftp://ftp.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/10.1-RELEASE/i386/Latest/FreeBSD-10.1-RELEASE-i386.raw.xz

Since new images are in raw format rather than qcow2 remove the runes to
convert from qcow2 to raw.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index cc8ecdb969c19053e8fc6fd979b2bd6d33c49e4e..70c1900bfe7f9bbeb052af46e6a4fd29c7fa45b5 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -150,7 +150,7 @@ do_freebsd_tests () {
  job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
                         test-freebsd xl $xenarch $dom0arch \
                         freebsd_arch=$freebsdarch \
- freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20140116-r260789.qcow2.xz} \
+ freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.1-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX-.raw.xz} \
                         all_hostflags=$most_hostflags
 
   done

diff --git a/ts-freebsd-install b/ts-freebsd-install
index 6c6abbef05203a89c325790f80cc526a4002fad2..61d2f830bab2e3ca2338478b5f34a42665fd1657 100755 (executable)
--- a/ts-freebsd-install
+++ b/ts-freebsd-install
@@ -51,8 +51,7 @@ our $freebsd_vm_repo= '/var/images';
 sub prep () {
     my $authkeys= authorized_keys();
 
-    target_install_packages_norec($ho, qw(rsync lvm2 qemu-utils
-                                          xz-utils kpartx));
+    target_install_packages_norec($ho, qw(rsync lvm2 xz-utils kpartx));
 
     $gho= prepareguest($ho, $gn, $guesthost, 22,
                        $disk_mb + 1,
@@ -76,9 +75,7 @@ sub prep () {
 
     target_cmd_root($ho, <<END, 900);
             set -ex
-            xz -dkc $rimage > $rimagebase.qcow2
-            qemu-img convert -f qcow2 $rimagebase.qcow2 -O raw $rimagebase.raw
-            rm $rimagebase.qcow2
+            xz -dkc $rimage > $rimagebase.raw
             dd if=$rimagebase.raw of=$gho->{Lvdev} bs=1M
             rm $rimagebase.raw