github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 02:51:55 +00:00
Code Issues Projects Releases Wiki Activity

Improve hyperkit/osx testing

Browse Source 
Address #954:
- Pull hyperkit and vpnkit binaries from CI
- Use vpnkit instead of vmnet
- Add hyperkit-test test target

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
This commit is contained in:
Robb Kistler 2017-01-17 18:47:07 -08:00
parent 3ef65e50f2
commit 29e3d74c2a
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
test.log test.log
*.swp *.swp
/hyperkit.git /hyperkit.bin
/disk.img /disk.img

31
Makefile
View File

@ -28,15 +28,30 @@ qemu-gce: Dockerfile.qemugce alpine/gce.img.tar.gz
tar cf - $^ | docker build -f Dockerfile.qemugce -t mobyqemugce:build - tar cf - $^ | docker build -f Dockerfile.qemugce -t mobyqemugce:build -
docker run -it --rm mobyqemugce:build docker run -it --rm mobyqemugce:build
hyperkit.git: hyperkit.bin:
git clone https://github.com/docker/hyperkit.git hyperkit.git mkdir $@
hyperkit.git/build/com.docker.hyperkit: hyperkit.git hyperkit.bin/com.docker.hyperkit: hyperkit.bin
cd hyperkit.git && make curl -fsSL https://circleci.com/api/v1/project/docker/hyperkit/latest/artifacts/0//Users/distiller/hyperkit/build/com.docker.hyperkit > $@
chmod a+x $@
hyperkit: hyperkit.sh hyperkit.git/build/com.docker.hyperkit alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 hyperkit.bin/com.docker.slirp:
sudo ./hyperkit.sh curl -fsSL https://circleci.com/api/v1/project/docker/vpnkit/latest/artifacts/0//Users/distiller/vpnkit/com.docker.slirp.tgz \
| tar xz --strip=2 -C hyperkit.bin Contents/MacOS/com.docker.slirp
hyperkit: hyperkit.sh hyperkit.bin/com.docker.hyperkit hyperkit.bin/com.docker.slirp alpine/initrd.img alpine/kernel/x86_64/vmlinuz64
./hyperkit.sh
define check_test_log
@cat $1 |grep -q 'Moby test suite PASSED'
endef
hyperkit-test: hyperkit.sh hyperkit.bin/com.docker.hyperkit hyperkit.bin/com.docker.slirp alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64
rm disk.img
touch test.log && \
INITRD=alpine/initrd-test.img ./hyperkit.sh 2>&1 | tee -a test.log
$(call check_test_log, test.log)
test: Dockerfile.test alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64 test: Dockerfile.test alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64
$(MAKE) -C alpine $(MAKE) -C alpine
BUILD=$$( tar cf - $^ | docker build -f Dockerfile.test -q - ) && \ BUILD=$$( tar cf - $^ | docker build -f Dockerfile.test -q - ) && \
@ -44,7 +59,7 @@ test: Dockerfile.test alpine/initrd-test.img alpine/kernel/x86_64/vmlinuz64
echo "Built $$BUILD" && \ echo "Built $$BUILD" && \
touch test.log && \ touch test.log && \
docker run --rm $$BUILD 2>&1 | tee -a test.log docker run --rm $$BUILD 2>&1 | tee -a test.log
@cat test.log | grep -q 'Moby test suite PASSED' $(call check_test_log, test.log)
TAG=$(shell git rev-parse HEAD) TAG=$(shell git rev-parse HEAD)
STATUS=$(shell git status -s) STATUS=$(shell git status -s)
@ -116,4 +131,4 @@ ci-pr:
clean: clean:
$(MAKE) -C alpine clean $(MAKE) -C alpine clean
rm -rf hyperkit.git disk.img rm -rf hyperkit.bin disk.img

15
hyperkit.sh
View File

@ -3,22 +3,21 @@
set -e set -e
KERNEL="alpine/kernel/x86_64/vmlinuz64" KERNEL="alpine/kernel/x86_64/vmlinuz64"
INITRD="alpine/initrd.img" : ${INITRD:="alpine/initrd.img"}
CMDLINE="earlyprintk=serial console=ttyS0" CMDLINE="earlyprintk=serial console=ttyS0"
[ -f disk.img ] || dd if=/dev/zero of=disk.img bs=1m count=256 [ -f disk.img ] || dd if=/dev/zero of=disk.img bs=1m count=256
MEM="-m 1G" MEM="-m 1G"
SMP="-c 1" SMP="-c 1"
NET="" SLIRP_SOCK=$(mktemp)
if (( $EUID != 0 )); then NET="-s 2:0,virtio-vpnkit,path=$SLIRP_SOCK"
printf "Need to run as root to get networking!\n\n"
exit 1
fi
NET="-s 2:0,virtio-net"
IMG_HDD="-s 4,virtio-blk,disk.img" IMG_HDD="-s 4,virtio-blk,disk.img"
PCI_DEV="-s 0:0,hostbridge -s 31,lpc" PCI_DEV="-s 0:0,hostbridge -s 31,lpc"
RND="-s 5,virtio-rnd" RND="-s 5,virtio-rnd"
LPC_DEV="-l com1,stdio" LPC_DEV="-l com1,stdio"
hyperkit.git/build/com.docker.hyperkit -A $MEM $SMP $PCI_DEV $LPC_DEV $NET $IMG_HDD $RND -u -f kexec,$KERNEL,$INITRD,"$CMDLINE" hyperkit.bin/com.docker.slirp --ethernet $SLIRP_SOCK &>/dev/null &
trap "kill $!; rm $SLIRP_SOCK" EXIT
hyperkit.bin/com.docker.hyperkit -A $MEM $SMP $PCI_DEV $LPC_DEV $NET $IMG_HDD $RND -u -f kexec,$KERNEL,$INITRD,"$CMDLINE"