Skip to content

Commit 044c425

Browse files
author
Ian Campbell
committed
Try booting with Hyperkit on MacOS
Signed-off-by: Ian Campbell <[email protected]>
1 parent 457e7d6 commit 044c425

File tree

1 file changed

+23
-10
lines changed

1 file changed

+23
-10
lines changed

.circleci/config.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,31 @@ image_build: &image_build
9090
paths: images
9191

9292
image_boot: &image_boot
93-
machine:
94-
enabled: true
95-
image: circleci/classic:latest # default Ubuntu 14.04 image
93+
#machine:
94+
# enabled: true
95+
# image: circleci/classic:latest # default Ubuntu 14.04 image
96+
macos:
97+
xcode: "9.0"
9698
steps:
9799
- run:
98100
name: Configure $PATH
99-
command: echo 'export PATH=~/workspace/bin-Linux:$PATH' >> $BASH_ENV
101+
#command: echo 'export PATH=~/workspace/bin-Linux:$PATH' >> $BASH_ENV
102+
command: echo 'export PATH=~/workspace/bin-Darwin:$PATH' >> $BASH_ENV
100103
- run:
101104
name: Install packages
102105
# ca-certificates are needed for attach_workspace (and git over https)
103-
command: sudo apt-get update && sudo apt-get install -y ca-certificates curl expect git make openssh-client procps qemu xorriso
106+
#command: sudo apt-get update && sudo apt-get install -y ca-certificates curl expect git make openssh-client procps qemu xorriso
107+
brew install xorriso
104108
- attach_workspace:
105109
at: ~/workspace
106110
- checkout
107111
- run:
108112
name: Test boot
109113
command: |
110114
set -x
111-
free
112-
cat /proc/meminfo
113-
ls -lrt /dev/kvm* || true
115+
#free
116+
#cat /proc/meminfo
117+
#ls -lrt /dev/kvm* || true
114118
# Add ssh keys to the image.
115119
# TODO could this be integrated into linuxkit/mkimage-iso-*
116120
# such that all those options do not need to be repeated
@@ -152,7 +156,7 @@ jobs:
152156
steps:
153157
- run:
154158
name: Create workspace
155-
command: mkdir -p /workspace/bin-Linux
159+
command: mkdir -p /workspace/bin-Linux /workspace/bin-Darwin
156160
- run:
157161
name: Install packages
158162
command: apt-get update && apt-get install -y ca-certificates curl openssh-client
@@ -162,19 +166,26 @@ jobs:
162166
curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz
163167
tar xfO /tmp/docker.tgz docker/docker > /workspace/bin-Linux/docker
164168
curl -fsSL -o /workspace/bin-Linux/linuxkit https://362-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
169+
curl -fsSL -o /workspace/bin-Darwin/linuxkithttps://362-46932243-gh.circle-artifacts.com/0/linuxkit-darwin-amd64
165170
curl -fsSL -o /workspace/bin-Linux/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
166171
curl -fsSL -o /workspace/bin-Linux/notary https://github.com/theupdateframework/notary/releases/download/v0.4.3/notary-Linux-amd64
167172
173+
curl -fsSL -o /workspace/bin-Darwin/hyperkit https://452-55985023-gh.circle-artifacts.com/0/Users/distiller/hyperkit/build/hyperkit
174+
curl -fsSL https://1066-58395340-gh.circle-artifacts.com/0/Users/distiller/vpnkit/vpnkit.tgz | tar zxfO - Contents/Resources/bin/vpnkit > /workspace/bin-Darwin/vpnkit
175+
168176
echo "Downloaded:"
169-
sha256sum /workspace/bin-Linux/*
177+
sha256sum /workspace/bin-Linux/* /workspace/bin-Darwin/*
170178
echo
171179
172180
echo "Checking checksums"
173181
sha256sum -c <<EOF
174182
6af40e74b2dbb2927882acab52d50bfc72551779d541957fc70b6adc325ee5ef /workspace/bin-Linux/docker
175183
b61188823c2491e9a1c16d275e41c68d5736f3f10577d01cb358261ff71bbad6 /workspace/bin-Linux/linuxkit
184+
908fae1c48122a245ddef8821a530a4c504f267ff1718b0c3688ef6f7aa3b65f /workspace/bin-Darwin/linuxkit
176185
e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d /workspace/bin-Linux/manifest-tool
177186
06cd02c4c2e7a3b1ad9899b03b3d4dde5392d964c675247d32f604a24661f839 /workspace/bin-Linux/notary
187+
298f650c9dd3ab8907b23f56cb21e33b794a5a8be163bbbcc7cf959112888b80 /workspace/bin-Darwin/hyperkit
188+
72e34d9c0bc0a73bfb71f2b572849db5829ca41c3995245145f2e57c8ab40bd2 /workspace/bin-Darwin/vpnkit
178189
EOF
179190
- run:
180191
name: Generate SSH Keys
@@ -186,8 +197,10 @@ jobs:
186197
command: |
187198
chmod +x /workspace/bin-Linux/docker # docker version deferred until daemon configured in relevant jobs
188199
chmod +x /workspace/bin-Linux/linuxkit && /workspace/bin-Linux/linuxkit version
200+
chmod +x /workspace/bin-Darwin/linuxkit && /workspace/bin-Darwin/linuxkit version
189201
chmod +x /workspace/bin-Linux/manifest-tool && /workspace/bin-Linux/manifest-tool --version
190202
chmod +x /workspace/bin-Linux/notary && /workspace/bin-Linux/notary version
203+
chmod +x /workspace/bin-Darwin/vpnkit && /workspace/bin-Darwin/vpnkit version
191204
- persist_to_workspace:
192205
root: /workspace
193206
paths: bin

0 commit comments

Comments
 (0)