Merge pull request #3258 from rn/kern-4.20

Remove 4.4.x kernels, add 4.20.x kernels

kernel/Dockerfile

@@ -176,9 +176,8 @@ RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info
 
 # perf
 # Only build perf for the latest LTS and the latest stable kernel.
-# There were intermittent breakage for 4.4.x and 4.9.x on some arches
 # Skip arm64 for now as perf for 4.19.x fails to build.
-RUN if ( [ "${KERNEL_SERIES}" = 4.14.x ] || [ "${KERNEL_SERIES}" = 4.19.x ] ) && [ $(uname -m) != aarch64 ]; then \
+RUN if [ "${KERNEL_SERIES}" != 4.9.x ] && [ $(uname -m) != aarch64 ]; then \
        mkdir -p /build/perf && \
        make -C tools/perf LDFLAGS=-static O=/build/perf && \
        strip /build/perf/perf && \

kernel/Makefile

@@ -157,8 +157,8 @@ fetch: sources/linux-$(1).tar.xz
 # with DCT as part of the dependency on build_$(2)$(3)$(4) and then build
 # with DOCKER_CONTENT_TRUST explicitly set to 0
 
-ifeq ($(2), $(filter $(2),4.14.x 4.19.x))
-# Only build perf for the latest LTS and the latest stable kernel.
+# Only build perf for the latest LTS and the latest stable kernel
+ifneq ($(2), $(filter $(2),4.9.x))
 ifneq ($(ARCH),aarch64)
 # Skip arm64 for now as perf for 4.19.x fails to build.
 build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
@@ -196,10 +196,9 @@ forcepush: forcepush_perf_$(2)$(3)$(4)
 endif
 endif
 
-# For BCC, only build on x86 and only on latest LTS and latest stable.
-# That's 4.14.x and 4.19.x at time of authorship.
+# Only build BCC on x86 and only on latest LTS and latest stable kernels.
 ifeq ($(ARCH),x86_64)
-ifeq ($(2), $(filter $(2),4.14.x 4.19.x))
+ifneq ($(2), $(filter $(2),4.9.x))
 build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
 		 DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \
@@ -262,19 +261,21 @@ endef
 # Debug targets only for latest stable and LTS stable
 #
 ifeq ($(ARCH),x86_64)
+$(eval $(call kernel,4.20,4.20.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.19.13,4.19.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.91,4.14.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.91,4.14.x,,-dbg))
 $(eval $(call kernel,4.14.78,4.14.x,-rt,))
 $(eval $(call kernel,4.9.148,4.9.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.4.169,4.4.x,$(EXTRA),$(DEBUG)))
 
 else ifeq ($(ARCH),aarch64)
+$(eval $(call kernel,4.20,4.20.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.19.13,4.19.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.91,4.14.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.78,4.14.x,-rt,))
 
 else ifeq ($(ARCH),s390x)
+$(eval $(call kernel,4.20,4.20.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.19.13,4.19.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.91,4.14.x,$(EXTRA),$(DEBUG)))
 endif

test/cases/020_kernel/006_config_4.20.x/test.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 # SUMMARY: Sanity check on the kernel config file
-# disabled for arm64, no 4.4 build
-# LABELS: amd64
+# LABELS:
 # REPEAT:
 
 set -e

test/cases/020_kernel/006_config_4.20.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.4.169
+  image: linuxkit/kernel:4.20
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1

test/cases/020_kernel/016_kmod_4.20.x/Dockerfile

@@ -3,7 +3,7 @@
 # In the last stage, it creates a package, which can be used for
 # testing.
 
-FROM linuxkit/kernel:4.4.169 AS ksrc
+FROM linuxkit/kernel:4.20 AS ksrc
 
 # Extract headers and compile module
 FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build

test/cases/020_kernel/016_kmod_4.20.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:4.4.169
+docker pull linuxkit/kernel:4.20
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/016_kmod_4.20.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.4.169
+  image: linuxkit/kernel:4.20
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:c563953a2277eb73a89d89f70e4b6dcdcfebc2d1