[Xen-devel] [PATCH v2 1/2] osstest: update FreeBSD guests to 10.1

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

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@xxxxxxxxxx>
Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
Changes since v1:
 - Remove the runes to convert the image from qcow2 to raw.
---
 make-flight        | 2 +-
 ts-freebsd-install | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/make-flight b/make-flight
index 8ac3a87..b340d78 100755
--- 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 6c6abbe..61d2f83 100755
--- 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
 
-- 
1.9.5 (Apple Git-50.3)


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel