From 8d4dfb25e6560ef8b96bd6f0d3ffdca08fdd296f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 22 Jun 2017 23:10:04 +0100 Subject: [PATCH] test: Load modules before testing for filesystems The previous commit moved some filesystems to kernel modules. modprobe them before checking if they are enabled. Also update the YAML files for the tests. Signed-off-by: Rolf Neugebauer --- .../020_kernel/000_config_4.4.x/test-kernel-config.yml | 3 +-- .../020_kernel/001_config_4.9.x/test-kernel-config.yml | 3 +-- .../020_kernel/003_config_4.11.x/test-kernel-config.yml | 3 +-- test/hack/test.yml | 3 +-- test/pkg/kernel-config/Dockerfile | 1 + test/pkg/kernel-config/check-kernel-config.sh | 9 +++++++++ 6 files changed, 14 insertions(+), 8 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 8be062ad7..d83240a10 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 @@ -7,8 +7,7 @@ init: - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config - image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" - readonly: true + image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 eb0b1e728..b443876f5 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 @@ -7,8 +7,7 @@ init: - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config - image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" - readonly: true + image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 912ae7f3b..208c6ad11 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 @@ -7,8 +7,7 @@ init: - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e onboot: - name: check-kernel-config - image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" - readonly: true + image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/hack/test.yml b/test/hack/test.yml index 3989ffe0f..cdde735d2 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -12,8 +12,7 @@ onboot: image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config - image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" - readonly: true + image: "linuxkit/test-kernel-config:9f08e3b99f8ac2f422251b3e8c94ce874ee34119" - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" command: ["/bin/sh", "/poweroff.sh", "3"] diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index 8c6f44395..a0a47bb58 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -3,3 +3,4 @@ RUN apk update && apk upgrade && apk add --no-cache bash ADD https://raw.githubusercontent.com/docker/docker/master/contrib/check-config.sh /check-config.sh ADD . ./ ENTRYPOINT ["/bin/sh", "/check.sh"] +LABEL org.mobyproject.config='{"readonly": true, "binds": ["/lib/modules:/lib/modules", "/dev:/dev", "/sys:/sys"], "capabilities": ["all"]}' diff --git a/test/pkg/kernel-config/check-kernel-config.sh b/test/pkg/kernel-config/check-kernel-config.sh index e30d642b3..d5a9c7f0f 100755 --- a/test/pkg/kernel-config/check-kernel-config.sh +++ b/test/pkg/kernel-config/check-kernel-config.sh @@ -86,6 +86,15 @@ echo $UNZIPPED_CONFIG | grep -q 'CONFIG_LEGACY_PTYS is not set' || fail "CONFIG_ echo $UNZIPPED_CONFIG | grep -q 'CONFIG_X86_X32 is not set' || fail "CONFIG_X86_X32 is not set" echo $UNZIPPED_CONFIG | grep -q 'CONFIG_MODIFY_LDT_SYSCALL is not set' || fail "CONFIG_MODIFY_LDT_SYSCALL is not set" +# modprobe +for mod in \ +nfs \ +nfsd \ +ntfs +do + modprobe $mod +done + # check filesystems that are built in for fs in \ sysfs \