diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-04-16 11:57:10 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-04-16 11:57:10 +0300 |
| commit | 0b0037d8f16995378f0d449df4456fd4886df1dc (patch) | |
| tree | 0085176fe9bbb4a1b6ac30b1fb848b83658d3897 | |
| parent | 16d9dc745a7406baef150ae42bdf47727d35401c (diff) | |
rewrite guestfs updating
| -rwxr-xr-x | jenkins-kvm-commands.sh | 1 | ||||
| -rw-r--r-- | kvm-lava.conf | 8 | ||||
| -rw-r--r-- | test-kvm.sh | 21 |
3 files changed, 16 insertions, 14 deletions
diff --git a/jenkins-kvm-commands.sh b/jenkins-kvm-commands.sh index ed9c765..ab50b9b 100755 --- a/jenkins-kvm-commands.sh +++ b/jenkins-kvm-commands.sh @@ -6,6 +6,7 @@ rm -rf lci-build-tools rm -f *deb *.gz bzr branch lp:~linaro-infrastructure/linaro-ci/lci-build-tools +echo "CONFIG_BLK_DEV_NBD=m" >> linaro/configs/kvm-host.conf # Build KVM kernel for vexpress export MAKE_DTBS=true diff --git a/kvm-lava.conf b/kvm-lava.conf new file mode 100644 index 0000000..5eda773 --- /dev/null +++ b/kvm-lava.conf @@ -0,0 +1,8 @@ + +start on runlevel [23] +stop on runlevel [!23] +console output +script + echo "kvm-boot-1: pass" + poweroff +end script diff --git a/test-kvm.sh b/test-kvm.sh index 3ffa93c..f0aa499 100644 --- a/test-kvm.sh +++ b/test-kvm.sh @@ -2,26 +2,19 @@ set -e -wget https://snapshots.linaro.org/kernel-hwpack/linux-vexpress-kvm/linux-vexpress-kvm/sd.img.gz -gunzip sd.img.gz +wget https://snapshots.linaro.org/kernel-hwpack/linux-vexpress-kvm/linux-vexpress-kvm/kvm.qcow2 + +apt-get install qemu-system -y +modprobe nbd max_part=16 +qemu-nbd -c /dev/nbd0 kvm.qcow2 +mount /dev/nbd0p2 /mnt/ -PARTSTART=`/sbin/fdisk -lu sd.img|awk '/sd.img2/ {print $2}'` -sudo mount -o loop,offset=$(($PARTSTART * 512)) sd.img /mnt cp /mnt/boot/vmlinuz-*-linaro-vexpress ./zImage cp /mnt/lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x1.dtb . -cat > /mnt/etc/init/kvm-lava.conf <<EOF -start on runlevel [23] -stop on runlevel [!23] -console output -script - echo "kvm-boot-1: pass" - poweroff -end script -EOF +cp kvm-lava.conf /mnt/etc/init/kvm-lava.conf umount /mnt -apt-get install qemu-system -y qemu-system-arm -M vexpress-a15 -m 1024 -kernel ./zImage -dtb ./rtsm_ve-cortex_a15x1.dtb -append 'root=/dev/mmcblk0p2 rw rootwait mem=1024M console=ttyAMA0,38400n8' -drive if=sd,cache=writeback,file=sd.img -redir tcp:5022::22 -nographic -enable-kvm 2>&1|tee kvm-log.txt || echo kvm-boot-1: fail |