diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index e97e96231..31229a196 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.104 + image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 diff --git a/test/cases/020_kernel/016_config_5.15.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml index 74fd3cb88..87acb1cec 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.yml +++ b/test/cases/020_kernel/016_config_5.15.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.15.27 + image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml index 9d7a66029..704b052fe 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.yml +++ b/test/cases/020_kernel/019_config_6.6.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:6.6.13 + image: linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04 diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index 253aed580..c41549a4d 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.4.172 AS ksrc +FROM linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc # Extract headers and compile module FROM linuxkit/kernel:5.4.172-builder AS build diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.sh b/test/cases/020_kernel/111_kmod_5.4.x/test.sh index 64e79c54e..cbdbd7fc8 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.sh +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.4.156 +docker pull linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile index e1d1d019d..2559d3701 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile +++ b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.10.104 AS ksrc +FROM linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc # Extract headers and compile module FROM linuxkit/kernel:5.10.104-builder AS build diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.sh b/test/cases/020_kernel/113_kmod_5.10.x/test.sh index eb21439db..50c26de33 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.sh +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.10.76 +docker pull linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile b/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile index d0fb99db6..bf50f7b3b 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile +++ b/test/cases/020_kernel/116_kmod_5.15.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.15.27 AS ksrc +FROM linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc # Extract headers and compile module FROM linuxkit/kernel:5.15.27-builder AS build diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.sh b/test/cases/020_kernel/116_kmod_5.15.x/test.sh index 97943dcfe..0d45077a5 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.sh +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.12.14 +docker pull linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile index 31b485c2a..403104d21 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile +++ b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:6.6.13 AS ksrc +FROM linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209 AS ksrc # Extract headers and compile module FROM linuxkit/kernel:6.6.13-builder AS build diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.sh b/test/cases/020_kernel/119_kmod_6.6.x/test.sh index 440eef6e9..f1995daf8 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.sh +++ b/test/cases/020_kernel/119_kmod_6.6.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:6.6.13 +docker pull linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/211_tags_5.4.x/test.sh b/test/cases/020_kernel/211_tags_5.4.x/test.sh index 34451d3ee..9c9d5d4ea 100644 --- a/test/cases/020_kernel/211_tags_5.4.x/test.sh +++ b/test/cases/020_kernel/211_tags_5.4.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.4.156 +KERNEL=linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/213_tags_5.10.x/test.sh b/test/cases/020_kernel/213_tags_5.10.x/test.sh index 30e6b46e8..50860c63b 100644 --- a/test/cases/020_kernel/213_tags_5.10.x/test.sh +++ b/test/cases/020_kernel/213_tags_5.10.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.10.76 +KERNEL=linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/216_tags_5.15.x/test.sh b/test/cases/020_kernel/216_tags_5.15.x/test.sh index 3ba327d51..5bd3165f9 100644 --- a/test/cases/020_kernel/216_tags_5.15.x/test.sh +++ b/test/cases/020_kernel/216_tags_5.15.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.12.14 +KERNEL=linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/219_tags_6.6.x/test.sh b/test/cases/020_kernel/219_tags_6.6.x/test.sh index 7ceeb2ef2..efa0c02dc 100644 --- a/test/cases/020_kernel/219_tags_6.6.x/test.sh +++ b/test/cases/020_kernel/219_tags_6.6.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:6.6.13 +KERNEL=linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209 # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/tags.sh b/test/cases/020_kernel/tags.sh index a0bc5ec92..0a870d6a5 100644 --- a/test/cases/020_kernel/tags.sh +++ b/test/cases/020_kernel/tags.sh @@ -27,7 +27,13 @@ clean_up() { trap clean_up EXIT # check the kernel images for tags, labels, files -BUILDER=${KERNEL}-builder +# builder image is based on semver, i.e. 5.10.104-builder +# and not hash, i.e. 5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b-builder, +# so get basic semver +KERNEL_IMAGE=${KERNEL%%:*} +KERNEL_TAG=${KERNEL##*:} +KERNEL_SEMVER=${KERNEL_TAG%%-*} +BUILDER=${KERNEL_IMAGE}:${KERNEL_SEMVER}-builder BUILDERFILE=/tmp/kernel-builder-$$ docker pull ${KERNEL}