Switch over to test-artifacts. 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> --- automation/gitlab-ci/build.yaml | 11 ------ automation/gitlab-ci/test.yaml | 4 +- .../kernel/6.6.74-arm64v8.dockerfile | 38 ------------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index ab758243c1ec..40dcd31f1bce 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -275,17 +275,6 @@ alpine-3.18-arm64-rootfs-export: tags: - arm64 -kernel-6.6.74-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a23ff8a6e7fe..59a2de28c864 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,8 +8,10 @@ - when: on_success .arm64-test-needs: &arm64-test-needs + - project: xen-project/hardware/test-artifacts + job: linux-6.6.86-arm64 + ref: master - alpine-3.18-arm64-rootfs-export - - kernel-6.6.74-arm64-export - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs diff --git a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile deleted file mode 100644 index 73e51454257d..000000000000 --- a/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/arm64/v8 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.6.74 -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 \ - libssl-dev \ - && \ - \ - # Build the kernel - 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 && \ - sed -i 's/CONFIG_IPV6=m/CONFIG_IPV6=y/g' .config && \ - sed -i 's/CONFIG_BRIDGE=m/CONFIG_BRIDGE=y/g' .config && \ - sed -i 's/# CONFIG_XEN_NETDEV_BACKEND is not set/CONFIG_XEN_NETDEV_BACKEND=y/g' .config && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- 2.39.5