From 3cb723fc5835e2ccf286f540fe51201265e59675 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 18 Apr 2021 21:00:11 +0100 Subject: [PATCH] tests: remove tests for 4.14.x and 5.6.x kernels Signed-off-by: Rolf Neugebauer --- .../020_kernel/002_config_4.14.x/test.sh | 24 -------------- .../020_kernel/002_config_4.14.x/test.yml | 15 --------- .../cases/020_kernel/012_config_5.6.x/test.sh | 24 -------------- .../020_kernel/012_config_5.6.x/test.yml | 15 --------- .../020_kernel/102_kmod_4.14.x/Dockerfile | 23 -------------- .../cases/020_kernel/102_kmod_4.14.x/check.sh | 15 --------- .../020_kernel/102_kmod_4.14.x/src/Makefile | 6 ---- .../102_kmod_4.14.x/src/hello_world.c | 22 ------------- test/cases/020_kernel/102_kmod_4.14.x/test.sh | 31 ------------------- .../cases/020_kernel/102_kmod_4.14.x/test.yml | 20 ------------ .../020_kernel/112_kmod_5.6.x/Dockerfile | 23 -------------- test/cases/020_kernel/112_kmod_5.6.x/check.sh | 15 --------- .../020_kernel/112_kmod_5.6.x/src/Makefile | 6 ---- .../112_kmod_5.6.x/src/hello_world.c | 22 ------------- test/cases/020_kernel/112_kmod_5.6.x/test.sh | 31 ------------------- test/cases/020_kernel/112_kmod_5.6.x/test.yml | 20 ------------ 16 files changed, 312 deletions(-) delete mode 100644 test/cases/020_kernel/002_config_4.14.x/test.sh delete mode 100644 test/cases/020_kernel/002_config_4.14.x/test.yml delete mode 100644 test/cases/020_kernel/012_config_5.6.x/test.sh delete mode 100644 test/cases/020_kernel/012_config_5.6.x/test.yml delete mode 100644 test/cases/020_kernel/102_kmod_4.14.x/Dockerfile delete mode 100755 test/cases/020_kernel/102_kmod_4.14.x/check.sh delete mode 100644 test/cases/020_kernel/102_kmod_4.14.x/src/Makefile delete mode 100644 test/cases/020_kernel/102_kmod_4.14.x/src/hello_world.c delete mode 100644 test/cases/020_kernel/102_kmod_4.14.x/test.sh delete mode 100644 test/cases/020_kernel/102_kmod_4.14.x/test.yml delete mode 100644 test/cases/020_kernel/112_kmod_5.6.x/Dockerfile delete mode 100755 test/cases/020_kernel/112_kmod_5.6.x/check.sh delete mode 100644 test/cases/020_kernel/112_kmod_5.6.x/src/Makefile delete mode 100644 test/cases/020_kernel/112_kmod_5.6.x/src/hello_world.c delete mode 100644 test/cases/020_kernel/112_kmod_5.6.x/test.sh delete mode 100644 test/cases/020_kernel/112_kmod_5.6.x/test.yml diff --git a/test/cases/020_kernel/002_config_4.14.x/test.sh b/test/cases/020_kernel/002_config_4.14.x/test.sh deleted file mode 100644 index fdfccb99c..000000000 --- a/test/cases/020_kernel/002_config_4.14.x/test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# SUMMARY: Sanity check on the kernel config file -# LABELS: -# REPEAT: - -set -e - -# Source libraries. Uncomment if needed/defined -#. "${RT_LIB}" -. "${RT_PROJECT_ROOT}/_lib/lib.sh" - -NAME=kconfig - -clean_up() { - rm -rf ${NAME}-* -} -trap clean_up EXIT - -# Test code goes here -linuxkit build -format kernel+initrd -name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" -echo "${RESULT}" | grep -q "suite PASSED" - -exit 0 diff --git a/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml deleted file mode 100644 index 1b62b4c90..000000000 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ /dev/null @@ -1,15 +0,0 @@ -kernel: - image: linuxkit/kernel:4.14.179 - cmdline: "console=ttyS0 console=ttyAMA0" -init: - - linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c - - linuxkit/runc:v0.8 -onboot: - - name: check-kernel-config - image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - - name: poweroff - image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/012_config_5.6.x/test.sh b/test/cases/020_kernel/012_config_5.6.x/test.sh deleted file mode 100644 index fdfccb99c..000000000 --- a/test/cases/020_kernel/012_config_5.6.x/test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# SUMMARY: Sanity check on the kernel config file -# LABELS: -# REPEAT: - -set -e - -# Source libraries. Uncomment if needed/defined -#. "${RT_LIB}" -. "${RT_PROJECT_ROOT}/_lib/lib.sh" - -NAME=kconfig - -clean_up() { - rm -rf ${NAME}-* -} -trap clean_up EXIT - -# Test code goes here -linuxkit build -format kernel+initrd -name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" -echo "${RESULT}" | grep -q "suite PASSED" - -exit 0 diff --git a/test/cases/020_kernel/012_config_5.6.x/test.yml b/test/cases/020_kernel/012_config_5.6.x/test.yml deleted file mode 100644 index c3211df8c..000000000 --- a/test/cases/020_kernel/012_config_5.6.x/test.yml +++ /dev/null @@ -1,15 +0,0 @@ -kernel: - image: linuxkit/kernel:5.6.11 - cmdline: "console=ttyS0 console=ttyAMA0" -init: - - linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c - - linuxkit/runc:v0.8 -onboot: - - name: check-kernel-config - image: linuxkit/test-kernel-config:fabda492c6efc9e34b9f994b09d03ffc0facd8d8 - - name: poweroff - image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile deleted file mode 100644 index 879ff536a..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# This Dockerfile extracts the kernel headers from the kernel image -# and then compiles a simple hello world kernel module against them. -# In the last stage, it creates a package, which can be used for -# testing. - -FROM linuxkit/kernel:4.14.179 AS ksrc - -# Extract headers and compile module -FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build -RUN apk add build-base elfutils-dev - -COPY --from=ksrc /kernel-dev.tar / -RUN tar xf kernel-dev.tar - -WORKDIR /kmod -COPY ./src/* ./ -RUN make all - -# Package -FROM alpine:3.11 -COPY --from=build /kmod/hello_world.ko / -COPY check.sh /check.sh -ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/102_kmod_4.14.x/check.sh b/test/cases/020_kernel/102_kmod_4.14.x/check.sh deleted file mode 100755 index 02e491624..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/check.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -function failed { - printf "Kernel module test suite FAILED\n" - /sbin/poweroff -f -} - -uname -a -modinfo hello_world.ko || failed -insmod hello_world.ko || failed -[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed -rmmod hello_world || failed - -printf "Kernel module test suite PASSED\n" - -/sbin/poweroff -f diff --git a/test/cases/020_kernel/102_kmod_4.14.x/src/Makefile b/test/cases/020_kernel/102_kmod_4.14.x/src/Makefile deleted file mode 100644 index 31c8215dd..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/src/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-m += hello_world.o -KVER=$(shell basename /usr/src/linux-headers-*) -all: - make -C /usr/src/$(KVER) M=$(PWD) modules -clean: - make -C /usr/src/$(KVER) M=$(PWD) clean diff --git a/test/cases/020_kernel/102_kmod_4.14.x/src/hello_world.c b/test/cases/020_kernel/102_kmod_4.14.x/src/hello_world.c deleted file mode 100644 index 7dd6d3ee2..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/src/hello_world.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * A simple Hello World kernel module - */ -#include -#include - -int init_hello(void) -{ - printk(KERN_INFO "Hello LinuxKit\n"); - return 0; -} - -void exit_hello(void) -{ - printk(KERN_INFO "Goodbye LinuxKit.\n"); -} - -module_init(init_hello); -module_exit(exit_hello); -MODULE_AUTHOR("Rolf Neugebauer "); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("A simple Hello World kernel module for testing"); diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.sh b/test/cases/020_kernel/102_kmod_4.14.x/test.sh deleted file mode 100644 index 45903d959..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# SUMMARY: Test build and insertion of kernel modules -# LABELS: -# REPEAT: - -set -e - -# Source libraries. Uncomment if needed/defined -#. "${RT_LIB}" -. "${RT_PROJECT_ROOT}/_lib/lib.sh" - -NAME=kmod -IMAGE_NAME=kmod-test - -clean_up() { - docker rmi ${IMAGE_NAME} || true - rm -rf ${NAME}-* -} -trap clean_up EXIT - -# Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.14.179 -# Build a package -docker build -t ${IMAGE_NAME} . - -# Build and run a LinuxKit image with kernel module (and test script) -linuxkit build -docker -format kernel+initrd -name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" -echo "${RESULT}" | grep -q "Hello LinuxKit" - -exit 0 diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.yml b/test/cases/020_kernel/102_kmod_4.14.x/test.yml deleted file mode 100644 index a455ec7b5..000000000 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.yml +++ /dev/null @@ -1,20 +0,0 @@ -kernel: - image: linuxkit/kernel:4.14.179 - cmdline: "console=ttyS0 console=ttyAMA0" -init: - - linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c - - linuxkit/runc:v0.8 -onboot: - - name: check - image: kmod-test - binds: - - /dev:/dev - - /lib/modules:/lib/modules - capabilities: - - all - - name: poweroff - image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit diff --git a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile deleted file mode 100644 index 4aff64e83..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# This Dockerfile extracts the kernel headers from the kernel image -# and then compiles a simple hello world kernel module against them. -# In the last stage, it creates a package, which can be used for -# testing. - -FROM linuxkit/kernel:5.6.11 AS ksrc - -# Extract headers and compile module -FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build -RUN apk add build-base elfutils-dev - -COPY --from=ksrc /kernel-dev.tar / -RUN tar xf kernel-dev.tar - -WORKDIR /kmod -COPY ./src/* ./ -RUN make all - -# Package -FROM alpine:3.11 -COPY --from=build /kmod/hello_world.ko / -COPY check.sh /check.sh -ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/112_kmod_5.6.x/check.sh b/test/cases/020_kernel/112_kmod_5.6.x/check.sh deleted file mode 100755 index 02e491624..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/check.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -function failed { - printf "Kernel module test suite FAILED\n" - /sbin/poweroff -f -} - -uname -a -modinfo hello_world.ko || failed -insmod hello_world.ko || failed -[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed -rmmod hello_world || failed - -printf "Kernel module test suite PASSED\n" - -/sbin/poweroff -f diff --git a/test/cases/020_kernel/112_kmod_5.6.x/src/Makefile b/test/cases/020_kernel/112_kmod_5.6.x/src/Makefile deleted file mode 100644 index 31c8215dd..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/src/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-m += hello_world.o -KVER=$(shell basename /usr/src/linux-headers-*) -all: - make -C /usr/src/$(KVER) M=$(PWD) modules -clean: - make -C /usr/src/$(KVER) M=$(PWD) clean diff --git a/test/cases/020_kernel/112_kmod_5.6.x/src/hello_world.c b/test/cases/020_kernel/112_kmod_5.6.x/src/hello_world.c deleted file mode 100644 index 7dd6d3ee2..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/src/hello_world.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * A simple Hello World kernel module - */ -#include -#include - -int init_hello(void) -{ - printk(KERN_INFO "Hello LinuxKit\n"); - return 0; -} - -void exit_hello(void) -{ - printk(KERN_INFO "Goodbye LinuxKit.\n"); -} - -module_init(init_hello); -module_exit(exit_hello); -MODULE_AUTHOR("Rolf Neugebauer "); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("A simple Hello World kernel module for testing"); diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.sh b/test/cases/020_kernel/112_kmod_5.6.x/test.sh deleted file mode 100644 index 47b2f6ada..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# SUMMARY: Test build and insertion of kernel modules -# LABELS: -# REPEAT: - -set -e - -# Source libraries. Uncomment if needed/defined -#. "${RT_LIB}" -. "${RT_PROJECT_ROOT}/_lib/lib.sh" - -NAME=kmod -IMAGE_NAME=kmod-test - -clean_up() { - docker rmi ${IMAGE_NAME} || true - rm -rf ${NAME}-* -} -trap clean_up EXIT - -# Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.6.11 -# Build a package -docker build -t ${IMAGE_NAME} . - -# Build and run a LinuxKit image with kernel module (and test script) -linuxkit build -docker -format kernel+initrd -name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" -echo "${RESULT}" | grep -q "Hello LinuxKit" - -exit 0 diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.yml b/test/cases/020_kernel/112_kmod_5.6.x/test.yml deleted file mode 100644 index 62a71c785..000000000 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.yml +++ /dev/null @@ -1,20 +0,0 @@ -kernel: - image: linuxkit/kernel:5.6.11 - cmdline: "console=ttyS0 console=ttyAMA0" -init: - - linuxkit/init:a68f9fa0c1d9dbfc9c23663749a0b7ac510cbe1c - - linuxkit/runc:v0.8 -onboot: - - name: check - image: kmod-test - binds: - - /dev:/dev - - /lib/modules:/lib/modules - capabilities: - - all - - name: poweroff - image: linuxkit/poweroff:06dd4e46c62fbe79123a028835c921f80e4855d3 - command: ["/bin/sh", "/poweroff.sh", "3"] -trust: - org: - - linuxkit