diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 820cc0af83..0817f11055 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -798,9 +798,9 @@ alpine-3.12-rootfs-export: tags: - x86_64 -kernel-5.10.74-export: +kernel-6.1.19-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.10.74 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 script: - mkdir binaries && cp /bzImage binaries/bzImage artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d75662358f..ee9e321077 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -15,6 +15,10 @@ .arm32-test-needs: &arm32-test-needs - qemu-system-aarch64-6.0.0-arm32-export +.x86-64-test-needs: &x86-64-test-needs + - alpine-3.12-rootfs-export + - kernel-6.1.19-export + .qemu-arm64: extends: .test-jobs-common variables: @@ -299,9 +303,8 @@ qemu-alpine-x86_64-gcc: script: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: + - *x86-64-test-needs - alpine-3.12-gcc - - alpine-3.12-rootfs-export - - kernel-5.10.74-export qemu-smoke-x86-64-gcc: extends: .qemu-x86-64 diff --git a/automation/tests-artifacts/kernel/5.10.74.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile similarity index 84% rename from automation/tests-artifacts/kernel/5.10.74.dockerfile rename to automation/tests-artifacts/kernel/6.1.19.dockerfile index 112e27fe45..c2171555a0 100644 --- a/automation/tests-artifacts/kernel/5.10.74.dockerfile +++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile @@ -3,7 +3,7 @@ LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.10.74 +ENV LINUX_VERSION=6.1.19 ENV USER root RUN mkdir /build @@ -25,11 +25,13 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* # Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ +RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ tar xvJf linux-"$LINUX_VERSION".tar.xz && \ cd linux-"$LINUX_VERSION" && \ make defconfig && \ make xen.config && \ + scripts/config --enable BRIDGE && \ + scripts/config --enable IGC && \ cp .config .config.orig && \ cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ make -j$(nproc) bzImage && \