[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 08/12] automation: update kernel for x86 tests
Update 6.1.x kernel to the latest version in this branch. This is especially needed to include MSI-X related fixes for stubdomain ("xen-pciback: Consider INTx disabled when MSI/MSI-X is enabled"). Signed-off-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> --- automation/gitlab-ci/build.yaml | 4 +- automation/gitlab-ci/test.yaml | 2 +- automation/tests-artifacts/kernel/6.1.19.dockerfile | 40 +-------------- automation/tests-artifacts/kernel/6.1.90.dockerfile | 40 ++++++++++++++- 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 automation/tests-artifacts/kernel/6.1.19.dockerfile create mode 100644 automation/tests-artifacts/kernel/6.1.90.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 783a0687ba34..9b9e5464f179 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -331,9 +331,9 @@ alpine-3.19-rootfs-export: tags: - x86_64 -kernel-6.1.19-export: +kernel-6.1.90-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.90 script: - mkdir binaries && cp /bzImage binaries/bzImage artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 80d10eb7f476..e3910f4c1a9f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -12,7 +12,7 @@ .x86-64-test-needs: &x86-64-test-needs - alpine-3.19-rootfs-export - - kernel-6.1.19-export + - kernel-6.1.90-export .qemu-arm64: extends: .test-jobs-common diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 3a4096780d20..000000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - libssl-dev \ - bc \ - curl \ - flex \ - bison \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -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 && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* diff --git a/automation/tests-artifacts/kernel/6.1.90.dockerfile b/automation/tests-artifacts/kernel/6.1.90.dockerfile new file mode 100644 index 000000000000..46cadf02ca78 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.1.90.dockerfile @@ -0,0 +1,40 @@ +FROM --platform=linux/amd64 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.1.90 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + libssl-dev \ + bc \ + curl \ + flex \ + bison \ + libelf-dev \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build the kernel +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 && \ + cp arch/x86/boot/bzImage / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* -- git-series 0.9.1
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |