From 29e3d74c2ab0a21800c1783dd845e94fd7a0661a Mon Sep 17 00:00:00 2001
From: Robb Kistler <robb.kistler@docker.com>
Date: Tue, 17 Jan 2017 18:47:07 -0800
Subject: [PATCH] Improve hyperkit/osx testing

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>
---
 .gitignore  |  2 +-
 Makefile    | 31 +++++++++++++++++++++++--------
 hyperkit.sh | 15 +++++++--------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1cc7ae843..06a8fb9e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 test.log
 *.swp
-/hyperkit.git
+/hyperkit.bin
 /disk.img
diff --git a/Makefile b/Makefile
index 91503bc81..529da15d0 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,30 @@ qemu-gce: Dockerfile.qemugce alpine/gce.img.tar.gz
 	tar cf - $^ | docker build -f Dockerfile.qemugce -t mobyqemugce:build -
 	docker run -it --rm mobyqemugce:build
 
-hyperkit.git:
-	git clone https://github.com/docker/hyperkit.git hyperkit.git
+hyperkit.bin:
+	mkdir $@
 
-hyperkit.git/build/com.docker.hyperkit: hyperkit.git
-	cd hyperkit.git && make
+hyperkit.bin/com.docker.hyperkit: hyperkit.bin
+	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
-	sudo ./hyperkit.sh
+hyperkit.bin/com.docker.slirp:
+	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
 	$(MAKE) -C alpine
 	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" && \
 	touch 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)
 STATUS=$(shell git status -s)
@@ -116,4 +131,4 @@ ci-pr:
 
 clean:
 	$(MAKE) -C alpine clean
-	rm -rf hyperkit.git disk.img
+	rm -rf hyperkit.bin disk.img
diff --git a/hyperkit.sh b/hyperkit.sh
index c69407042..0b8c1c300 100755
--- a/hyperkit.sh
+++ b/hyperkit.sh
@@ -3,22 +3,21 @@
 set -e
 
 KERNEL="alpine/kernel/x86_64/vmlinuz64"
-INITRD="alpine/initrd.img"
+: ${INITRD:="alpine/initrd.img"}
 CMDLINE="earlyprintk=serial console=ttyS0"
 
 [ -f disk.img ] || dd if=/dev/zero of=disk.img bs=1m count=256
 
 MEM="-m 1G"
 SMP="-c 1"
-NET=""
-if (( $EUID != 0 )); then
-    printf "Need to run as root to get networking!\n\n"
-    exit 1
-fi
-NET="-s 2:0,virtio-net"
+SLIRP_SOCK=$(mktemp)
+NET="-s 2:0,virtio-vpnkit,path=$SLIRP_SOCK"
 IMG_HDD="-s 4,virtio-blk,disk.img"
 PCI_DEV="-s 0:0,hostbridge -s 31,lpc"
 RND="-s 5,virtio-rnd"
 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"