From 1ebc8c00991618d036ac2604cd84997b1c4811e6 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 12 Jul 2018 10:34:12 +0100 Subject: [PATCH 1/2] tests: Update linuxkit/alpine for tests as well. I missed this during the recent updates. Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/010_kmod_4.4.x/Dockerfile | 2 +- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/019_kmod_4.17.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile index 3b6e14473..d1a62c677 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.4.139 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build +FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index a6cfa9e33..92bee834a 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.9.111 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build +FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index 17c595656..833ecfbdf 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.54 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build +FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile index 4976f09eb..b2e6a5822 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile +++ b/test/cases/020_kernel/019_kmod_4.17.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.17.5 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build +FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / From 59e04612b4f925d96859b90802ede573d6f9a294 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 12 Jul 2018 10:38:32 +0100 Subject: [PATCH 2/2] docs: Add update of test cases to release doc While at it also improve the commit messages. Signed-off-by: Rolf Neugebauer --- docs/releasing.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/releasing.md b/docs/releasing.md index e4ca74994..273a796da 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -113,7 +113,7 @@ cd $LK_ROOT/tools ../scripts/update-component-sha.sh --image linuxkit/alpine:$LK_ALPINE git checkout alpine/versions.aarch64 alpine/versions.s390x -git commit -a -s -m "tools: Update to latest alpine base" +git commit -a -s -m "tools: Update to the latest linuxkit/alpine" git push $LK_REMOTE rel_$LK_RELEASE make forcepush @@ -151,7 +151,7 @@ Next, we update the test packages to the updated alpine base on the `x86_64` sys cd $LK_ROOT/test/pkg ../../scripts/update-component-sha.sh --image linuxkit/alpine:$LK_ALPINE -git commit -a -s -m "tests: Update packages to latest alpine base" +git commit -a -s -m "tests: Update packages to the latest linuxkit/alpine" git push $LK_REMOTE rel_$LK_RELEASE make push @@ -176,6 +176,15 @@ done git commit -a -s -m "Update use of test packages to latest" ``` +Some tests also use `linuxkit/alpine`. Update them as well: + +```sh +cd $LK_ROOT/test/cases +../../scripts/update-component-sha.sh --image linuxkit/alpine:$LK_ALPINE + +git commit -a -s -m "tests: Update tests cases to the latest linuxkit/alpine" +``` + ### Update packages Next, we update the LinuxKit packages. This is really the core of the @@ -187,7 +196,7 @@ across packages. cd $LK_ROOT/pkg ../scripts/update-component-sha.sh --image linuxkit/alpine:$LK_ALPINE -git commit -a -s -m "pkgs: Update packages to latest alpine base" +git commit -a -s -m "pkgs: Update packages to the latest linuxkit/alpine" git push $LK_REMOTE rel_$LK_RELEASE ```