github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 09:09:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4004 from deitch/missing-kernel-hashes

Browse Source 
add missing hashes for kernel version-specific test cases
This commit is contained in:
Avi Deitcher
2024-03-04 05:12:28 -08:00
committed by GitHub
parent 600e12f184 3f10329ec2
commit 83efa26b65
16 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/cases/020_kernel/013_config_5.10.x/test.yml
View File

@@ -1,5 +1,5 @@
kernel: kernel:
image: linuxkit/kernel:5.10.104 image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b
cmdline: "console=ttyS0 console=ttyAMA0" cmdline: "console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6

2
test/cases/020_kernel/016_config_5.15.x/test.yml
View File

@@ -1,5 +1,5 @@
kernel: kernel:
image: linuxkit/kernel:5.15.27 image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b
cmdline: "console=ttyS0 console=ttyAMA0" cmdline: "console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6 - linuxkit/init:45a1ad5919f0b6acf0f0cf730e9434abfae11fe6

2
test/cases/020_kernel/019_config_6.6.x/test.yml
View File

@@ -1,5 +1,5 @@
kernel: kernel:
image: linuxkit/kernel:6.6.13 image: linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209
cmdline: "console=ttyS0 console=ttyAMA0" cmdline: "console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04 - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04

2
test/cases/020_kernel/111_kmod_5.4.x/Dockerfile
View File

@@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for # In the last stage, it creates a package, which can be used for
# testing. # testing.
FROM linuxkit/kernel:5.4.172 AS ksrc FROM linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc
# Extract headers and compile module # Extract headers and compile module
FROM linuxkit/kernel:5.4.172-builder AS build FROM linuxkit/kernel:5.4.172-builder AS build

2
test/cases/020_kernel/111_kmod_5.4.x/test.sh
View File

@@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# Make sure we have the latest kernel image # 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 # Build a package
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/113_kmod_5.10.x/Dockerfile
View File

@@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for # In the last stage, it creates a package, which can be used for
# testing. # testing.
FROM linuxkit/kernel:5.10.104 AS ksrc FROM linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc
# Extract headers and compile module # Extract headers and compile module
FROM linuxkit/kernel:5.10.104-builder AS build FROM linuxkit/kernel:5.10.104-builder AS build

2
test/cases/020_kernel/113_kmod_5.10.x/test.sh
View File

@@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# Make sure we have the latest kernel image # 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 # Build a package
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/116_kmod_5.15.x/Dockerfile
View File

@@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for # In the last stage, it creates a package, which can be used for
# testing. # testing.
FROM linuxkit/kernel:5.15.27 AS ksrc FROM linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b AS ksrc
# Extract headers and compile module # Extract headers and compile module
FROM linuxkit/kernel:5.15.27-builder AS build FROM linuxkit/kernel:5.15.27-builder AS build

2
test/cases/020_kernel/116_kmod_5.15.x/test.sh
View File

@@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# Make sure we have the latest kernel image # 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 # Build a package
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
View File

@@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for # In the last stage, it creates a package, which can be used for
# testing. # testing.
FROM linuxkit/kernel:6.6.13 AS ksrc FROM linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209 AS ksrc
# Extract headers and compile module # Extract headers and compile module
FROM linuxkit/kernel:6.6.13-builder AS build FROM linuxkit/kernel:6.6.13-builder AS build

2
test/cases/020_kernel/119_kmod_6.6.x/test.sh
View File

@@ -19,7 +19,7 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# Make sure we have the latest kernel image # 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 # Build a package
docker build -t ${IMAGE_NAME} . docker build -t ${IMAGE_NAME} .

2
test/cases/020_kernel/211_tags_5.4.x/test.sh
View File

@@ -5,7 +5,7 @@
set -e set -e
KERNEL=linuxkit/kernel:5.4.156 KERNEL=linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b
# just include the common test # just include the common test
. ../tags.sh . ../tags.sh

2
test/cases/020_kernel/213_tags_5.10.x/test.sh
View File

@@ -5,7 +5,7 @@
set -e set -e
KERNEL=linuxkit/kernel:5.10.76 KERNEL=linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b
# just include the common test # just include the common test
. ../tags.sh . ../tags.sh

2
test/cases/020_kernel/216_tags_5.15.x/test.sh
View File

@@ -5,7 +5,7 @@
set -e set -e
KERNEL=linuxkit/kernel:5.12.14 KERNEL=linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b
# just include the common test # just include the common test
. ../tags.sh . ../tags.sh

2
test/cases/020_kernel/219_tags_6.6.x/test.sh
View File

@@ -5,7 +5,7 @@
set -e set -e
KERNEL=linuxkit/kernel:6.6.13 KERNEL=linuxkit/kernel:6.6.13-4f0f536b9a057590102379043a0815d2f0e28209
# just include the common test # just include the common test
. ../tags.sh . ../tags.sh

8
test/cases/020_kernel/tags.sh
View File

@@ -27,7 +27,13 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# check the kernel images for tags, labels, files # 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-$$ BUILDERFILE=/tmp/kernel-builder-$$
docker pull ${KERNEL} docker pull ${KERNEL}