From 88c63ad38966f976cc08b47623378306c475d0b7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 14 Jul 2017 13:58:16 +0100 Subject: [PATCH] Do not fail if some modules not found May be built in to kernel. Signed-off-by: Justin Cormack --- test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml | 2 +- test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/kernel-config/check-kernel-config.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index b16503014..347136abf 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 + image: linuxkit/test-kernel-config:6c1219678ff314c7790c4485d95744504e18205f - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index db7effda9..bb37a6304 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 + image: linuxkit/test-kernel-config:6c1219678ff314c7790c4485d95744504e18205f - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index 9655287ef..dbe93cf9e 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:f5b28379fc969237e0fb11aa1ed946622150e9a0 onboot: - name: check-kernel-config - image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 + image: linuxkit/test-kernel-config:6c1219678ff314c7790c4485d95744504e18205f - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/hack/test.yml b/test/hack/test.yml index 989653345..284d8e868 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119 + image: linuxkit/test-kernel-config:6c1219678ff314c7790c4485d95744504e18205f - name: poweroff image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05 command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/pkg/kernel-config/check-kernel-config.sh b/test/pkg/kernel-config/check-kernel-config.sh index d5a9c7f0f..18f126540 100755 --- a/test/pkg/kernel-config/check-kernel-config.sh +++ b/test/pkg/kernel-config/check-kernel-config.sh @@ -92,7 +92,7 @@ nfs \ nfsd \ ntfs do - modprobe $mod + modprobe $mod 2>/dev/null || true done # check filesystems that are built in