Update mkimage tests to match output

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-06-01 14:49:49 +01:00
parent ad1d33255d
commit 5394ec26f2
2 changed files with 4 additions and 10 deletions

View File

@ -7,16 +7,9 @@ init:
- linuxkit/containerd:deaf5bf838bf7f131c2287ecff3ed9835b0497e2
onboot:
- name: mkimage
image: "linuxkit/mkimage:a3fd615543b84733ac8ba6f7e1927727665ef404"
image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3"
- name: poweroff
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
files:
- path: data/kernel
source: run-kernel
- path: data/initrd.img
source: run-initrd.img
- path: data/cmdline
source: run-cmdline
trust:
org:
- linuxkit

View File

@ -12,14 +12,15 @@ set -e
clean_up() {
find . -iname "run*" -not -iname "*.yml" -exec rm -rf {} \;
find . -iname "mkimage*" -not -iname "*.yml" -exec rm -rf {} \;
rm -f disk.qcow2
rm -f disk.qcow2 tarball.img
}
trap clean_up EXIT
# Test code goes here
moby build -output kernel+initrd run.yml
moby build -output kernel+initrd mkimage.yml
linuxkit run qemu -disk disk.qcow2,size=200M,format=qcow2 -kernel mkimage
tar cf tarball.img run-kernel run-initrd.img run-cmdline
linuxkit run qemu -disk disk.qcow2,size=200M,format=qcow2 -disk tarball.img,format=raw -kernel mkimage
linuxkit run qemu disk.qcow2
exit 0