diff options
| -rwxr-xr-x | jenkins-kvm-commands.sh | 5 | ||||
| -rw-r--r-- | test-kvm.sh | 3 | ||||
| -rw-r--r-- | ubuntu/kvm.yaml | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/jenkins-kvm-commands.sh b/jenkins-kvm-commands.sh index a681dbc..c94d087 100755 --- a/jenkins-kvm-commands.sh +++ b/jenkins-kvm-commands.sh @@ -1,6 +1,6 @@ #!/bin/bash -sudo apt-get install -y qemu-utils xz-utils +sudo apt-get install -y qemu-utils rm -rf lci-build-tools builddir-* rm -f *deb *.gz @@ -49,11 +49,10 @@ mv upload-dir/sd.img . mv upload-dir-arndale/sd.img arndale-sd.img # create the guest fs image as qcow2 -qemu-img convert -f raw -O qcow2 sd.img kvm.qcow2 +qemu-img convert -f raw -O qcow2 -c sd.img kvm.qcow2 # Compress image(s) gzip sd.img arndale-sd.img -xz kvm.qcow2 cat <<EOF > post_build_lava_parameters HWPACK_JOB_NAME=${JOB_NAME} diff --git a/test-kvm.sh b/test-kvm.sh index ed358e3..1c942b9 100644 --- a/test-kvm.sh +++ b/test-kvm.sh @@ -2,9 +2,8 @@ set -e -wget https://snapshots.linaro.org/kernel-hwpack/linux-vexpress-kvm/linux-vexpress-kvm/kvm.qcow2.xz +wget https://snapshots.linaro.org/kernel-hwpack/linux-vexpress-kvm/linux-vexpress-kvm/kvm.qcow2 -unxz kvm.qcow2.xz modprobe nbd max_part=16 qemu-nbd -c /dev/nbd0 kvm.qcow2 mount /dev/nbd0p2 /mnt/ diff --git a/ubuntu/kvm.yaml b/ubuntu/kvm.yaml index ccea54e..37941fd 100644 --- a/ubuntu/kvm.yaml +++ b/ubuntu/kvm.yaml @@ -8,7 +8,6 @@ install: - git://git.linaro.org/ci/kvm-ci.git deps: - qemu-system - - xz-utils run: steps: - chmod a+x kvm-ci/test-kvm.sh |