Linux 6.6.56 was already added to test-artifacts for the argo testing, and
this removes one moving part while cleaning things up.
Drop the associated export job, and dockerfile.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Anthony PERARD <anthony.per...@vates.tech>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Michal Orzel <michal.or...@amd.com>
CC: Doug Goldstein <car...@cardoe.com>
CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
Also, somewhere between 6.6.56 and 6.6.74, PVH stops working
---
automation/gitlab-ci/build.yaml | 13 ------
automation/gitlab-ci/test.yaml | 4 +-
.../tests-artifacts/kernel/6.1.19.dockerfile | 41 -------------------
3 files changed, 3 insertions(+), 55 deletions(-)
delete mode 100644 automation/tests-artifacts/kernel/6.1.19.dockerfile
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 169bebe3c775..ab758243c1ec 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -308,19 +308,6 @@ qemu-system-aarch64-6.0.0-arm32-export:
tags:
- arm64
-# x86_64 test artifacts
-
-kernel-6.1.19-export:
- extends: .test-jobs-artifact-common
- image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19
- script:
- - mkdir binaries && cp /bzImage binaries/bzImage
- artifacts:
- paths:
- - binaries/bzImage
- tags:
- - x86_64
-
# Jobs below this line
# Build jobs needed for tests
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index d05b9a98afa6..a23ff8a6e7fe 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -16,7 +16,9 @@
- qemu-system-aarch64-6.0.0-arm32-export
.x86-64-test-needs: &x86-64-test-needs
- - kernel-6.1.19-export
+ - project: xen-project/hardware/test-artifacts
+ job: linux-6.6.56-x86_64
+ ref: master
- project: xen-project/hardware/test-artifacts
job: x86_64-rootfs-alpine-3.18
ref: master
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 073eaa0e11fa..000000000000
--- a/automation/tests-artifacts/kernel/6.1.19.dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 debian:bookworm
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@lists.xenproject.org"
-
-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 \
- 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 && \
- scripts/config --enable TUN && \
- 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"*
--
2.39.5
