Skip to content

Commit 8e10db4

Browse files
author
Ian Campbell
committed
CI: Build .iso (but not -efi.iso) images.
Previously (in #8) building both seemed to timeout or otherwise fall foul of some sort of infra glitch. Try just building one for now. This is a first step in trying to actually boot images in CI. Signed-off-by: Ian Campbell <[email protected]>
1 parent 5f3b89a commit 8e10db4

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.circleci/config.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,22 @@ linuxkit_pkg_build: &linuxkit_pkg_build
3535
image_build: &image_build
3636
docker:
3737
- image: debian:stretch
38+
# image builds seem to need a bit more grunt (RAM) than usual. Possibly getting OOM killed, which https://github.com/moby/tool/pull/191 might help.
39+
# NB: This will become a paid for feature at some point soon (with plenty of warning), so is not a long term solution.
40+
# small 1.0 2GB
41+
# medium (default) 2.0 4GB pass: fail:5
42+
# medium+ 3.0 6GB pass: fail:2
43+
# large 4.0 8GB pass:2 fail:
44+
# xlarge 8.0 16GB
45+
resource_class: large
3846
steps:
3947
- run:
4048
name: Configure $PATH
4149
command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
4250
- run:
4351
name: Install packages
4452
# ca-certificates are needed for attach_workspace (and git over https)
45-
command: apt-get update && apt-get install -y ca-certificates curl git make openssh-client
53+
command: apt-get update && apt-get install -y ca-certificates curl git make openssh-client strace
4654
- attach_workspace:
4755
at: /workspace
4856
- checkout
@@ -72,10 +80,12 @@ image_build: &image_build
7280
command: |
7381
mkdir -p /workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK
7482
df -h .
75-
# KUBE_FORMATS="iso-efi iso-bios" times out or fails for larger docker images.
76-
# Just do tar for now.
77-
make KUBE_FORMATS="tar" kube-master.iso kube-node.iso
78-
#mv kube-master*.iso kube-node*.iso /workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK
83+
ulimit -a
84+
make LINUXKIT_ARGS="-v" KUBE_FORMATS="iso-bios" kube-master.iso kube-node.iso
85+
mv kube-master*.iso kube-node*.iso /workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK
86+
- persist_to_workspace:
87+
root: /workspace
88+
paths: images
7989

8090
version: 2
8191
jobs:

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))
1414
all: kube-master.iso kube-node.iso
1515

1616
kube-master.iso: yml/kube.yml yml/$(KUBE_RUNTIME).yml yml/$(KUBE_RUNTIME)-master.yml yml/$(KUBE_NETWORK).yml
17+
# strace logs received signals
18+
#strace -f -e trace=signal
1719
linuxkit $(LINUXKIT_ARGS) build $(LINUXKIT_BUILD_ARGS) -name kube-master $(KUBE_FORMAT_ARGS) $^
1820

1921
kube-node.iso: yml/kube.yml yml/$(KUBE_RUNTIME).yml yml/$(KUBE_NETWORK).yml

0 commit comments

Comments
 (0)