From 9f2ff29e5ec0881bea4ba6dbd693524f3976325d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 18 Jan 2022 12:55:03 +0000 Subject: [PATCH] tests: Add 5.15.x kernel tests (renamed from 5.12) Signed-off-by: Rolf Neugebauer --- .../{015_config_5.12.x => 016_config_5.15.x}/test.sh | 0 .../{015_config_5.12.x => 016_config_5.15.x}/test.yml | 2 +- .../{115_kmod_5.12.x => 116_kmod_5.15.x}/Dockerfile | 4 ++-- .../020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/check.sh | 0 .../{115_kmod_5.12.x => 116_kmod_5.15.x}/src/Makefile | 0 .../{115_kmod_5.12.x => 116_kmod_5.15.x}/src/hello_world.c | 0 .../020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/test.sh | 0 .../020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/test.yml | 2 +- .../020_kernel/{215_tags_5.12.x => 216_tags_5.15.x}/test.sh | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename test/cases/020_kernel/{015_config_5.12.x => 016_config_5.15.x}/test.sh (100%) rename test/cases/020_kernel/{015_config_5.12.x => 016_config_5.15.x}/test.yml (92%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/Dockerfile (86%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/check.sh (100%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/src/Makefile (100%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/src/hello_world.c (100%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/test.sh (100%) rename test/cases/020_kernel/{115_kmod_5.12.x => 116_kmod_5.15.x}/test.yml (93%) rename test/cases/020_kernel/{215_tags_5.12.x => 216_tags_5.15.x}/test.sh (100%) diff --git a/test/cases/020_kernel/015_config_5.12.x/test.sh b/test/cases/020_kernel/016_config_5.15.x/test.sh similarity index 100% rename from test/cases/020_kernel/015_config_5.12.x/test.sh rename to test/cases/020_kernel/016_config_5.15.x/test.sh diff --git a/test/cases/020_kernel/015_config_5.12.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml similarity index 92% rename from test/cases/020_kernel/015_config_5.12.x/test.yml rename to test/cases/020_kernel/016_config_5.15.x/test.yml index e66b533b8..7c47bb16c 100644 --- a/test/cases/020_kernel/015_config_5.12.x/test.yml +++ b/test/cases/020_kernel/016_config_5.15.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.12.14 + image: linuxkit/kernel:5.15.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 diff --git a/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile b/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile similarity index 86% rename from test/cases/020_kernel/115_kmod_5.12.x/Dockerfile rename to test/cases/020_kernel/116_kmod_5.15.x/Dockerfile index 5510e53d3..94950b476 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/Dockerfile +++ b/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile @@ -3,10 +3,10 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.12.14 AS ksrc +FROM linuxkit/kernel:5.15.15 AS ksrc # Extract headers and compile module -FROM linuxkit/kernel:5.12.14-builder AS build +FROM linuxkit/kernel:5.15.15-builder AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/115_kmod_5.12.x/check.sh b/test/cases/020_kernel/116_kmod_5.15.x/check.sh similarity index 100% rename from test/cases/020_kernel/115_kmod_5.12.x/check.sh rename to test/cases/020_kernel/116_kmod_5.15.x/check.sh diff --git a/test/cases/020_kernel/115_kmod_5.12.x/src/Makefile b/test/cases/020_kernel/116_kmod_5.15.x/src/Makefile similarity index 100% rename from test/cases/020_kernel/115_kmod_5.12.x/src/Makefile rename to test/cases/020_kernel/116_kmod_5.15.x/src/Makefile diff --git a/test/cases/020_kernel/115_kmod_5.12.x/src/hello_world.c b/test/cases/020_kernel/116_kmod_5.15.x/src/hello_world.c similarity index 100% rename from test/cases/020_kernel/115_kmod_5.12.x/src/hello_world.c rename to test/cases/020_kernel/116_kmod_5.15.x/src/hello_world.c diff --git a/test/cases/020_kernel/115_kmod_5.12.x/test.sh b/test/cases/020_kernel/116_kmod_5.15.x/test.sh similarity index 100% rename from test/cases/020_kernel/115_kmod_5.12.x/test.sh rename to test/cases/020_kernel/116_kmod_5.15.x/test.sh diff --git a/test/cases/020_kernel/115_kmod_5.12.x/test.yml b/test/cases/020_kernel/116_kmod_5.15.x/test.yml similarity index 93% rename from test/cases/020_kernel/115_kmod_5.12.x/test.yml rename to test/cases/020_kernel/116_kmod_5.15.x/test.yml index 0f76b223f..aef2a8fcb 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/test.yml +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.12.14 + image: linuxkit/kernel:5.15.15 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927 diff --git a/test/cases/020_kernel/215_tags_5.12.x/test.sh b/test/cases/020_kernel/216_tags_5.15.x/test.sh similarity index 100% rename from test/cases/020_kernel/215_tags_5.12.x/test.sh rename to test/cases/020_kernel/216_tags_5.15.x/test.sh