From 350036e34d5c5ee772d2370f64c1ae00df36ed69 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 31 Mar 2018 13:51:36 +0100 Subject: [PATCH 1/3] test: Update kernel config package to latest alpine base Signed-off-by: Rolf Neugebauer --- test/pkg/kernel-config/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index ef8dee29e..4d6bb017d 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS mirror +FROM linuxkit/alpine:96ad1eb5ec262b4cd0eef574cdc0b225b502d9ee AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl bash From b51c406e4f8d28649a36f1b2dcfb9647c0b24203 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 31 Mar 2018 13:53:07 +0100 Subject: [PATCH 2/3] test: Build kernel config package only for x86 and arm64 for now The test currently only works on these arches. Signed-off-by: Rolf Neugebauer --- test/pkg/kernel-config/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/pkg/kernel-config/build.yml b/test/pkg/kernel-config/build.yml index cb24486a5..13a0166fb 100644 --- a/test/pkg/kernel-config/build.yml +++ b/test/pkg/kernel-config/build.yml @@ -1,2 +1,5 @@ image: test-kernel-config network: true +arches: + - amd64 + - arm64 From 70b37c70474bb007dc0912e1535ab649e961421e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 31 Mar 2018 14:00:06 +0100 Subject: [PATCH 3/3] Update test-kernel-config hash Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/007_config_4.15.x/test.yml | 2 +- test/hack/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index ce01efa24..86b596d31 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 + image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 341eb5378..3192393e3 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 + image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index beea7dfaa..6363a28f4 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 + image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index f6059657b..77a7f7962 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:e4b01b68b225d694a60f8b335258bd2144971239 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 + image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/hack/test.yml b/test/hack/test.yml index 88d509491..fd28612dd 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/dhcpcd:8b23f047ffa4d657a2c7dd465e69cc13721c4165 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:f658811da20f069f71a863ba9469b4a2ae8910e1 + image: linuxkit/test-kernel-config:a3eb5aa39ed8e426cc2b33606820edc59301ae4d - name: poweroff image: linuxkit/poweroff:f9a0a5e52fd2a97908bda33db2afffafe4a6a67d command: ["/bin/sh", "/poweroff.sh", "3"]