From fb4d6218336fe7c2dfcbb8f52c9af331a02ab9a6 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Wed, 12 Apr 2017 12:04:49 +0100 Subject: [PATCH] tests: use the poweroff pkg in test-kernel-config Signed-off-by: Dave Tucker --- test/cases/test-kernel-config.yml | 7 ++++++- test/pkg/kernel-config/check.sh | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/cases/test-kernel-config.yml b/test/cases/test-kernel-config.yml index 24ef97b21..4622d3858 100644 --- a/test/cases/test-kernel-config.yml +++ b/test/cases/test-kernel-config.yml @@ -19,8 +19,13 @@ onboot: net: host command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: "mobylinux/kernel-config:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f" + image: "linuxkit/kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" + readonly: true +services: + - name: poweroff + image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" pid: host + command: ["/bin/sh", "/poweroff.sh", "3"] capabilities: - CAP_SYS_BOOT readonly: true diff --git a/test/pkg/kernel-config/check.sh b/test/pkg/kernel-config/check.sh index b28311d9b..dd37b4239 100755 --- a/test/pkg/kernel-config/check.sh +++ b/test/pkg/kernel-config/check.sh @@ -2,7 +2,6 @@ function failed { printf "Kernel config test suite FAILED\n" - /sbin/poweroff -f } /check-kernel-config.sh || failed @@ -11,5 +10,3 @@ bash /check-config.sh || failed printf "Kernel config test suite PASSED\n" cat /etc/linuxkit - -/sbin/poweroff -f