After qemu-smoke-arm64 was changed to use kernel 5.19 we end up having
two kernel configurations. This is something not needed and maintaining
a single kernel version is always easier. Modify qemu-alpine-arm64-gcc
to use kernel 5.19 and remove kernel 5.9 from tests-artifacts.
Signed-off-by: Michal Orzel <michal.or...@amd.com>
---
automation/gitlab-ci/build.yaml | 11 ------
automation/gitlab-ci/test.yaml | 2 +-
.../kernel/5.9.9-arm64v8.dockerfile | 34 -------------------
3 files changed, 1 insertion(+), 46 deletions(-)
delete mode 100644 automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index d2f75a090c0f..720ce6e07ba0 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -586,17 +586,6 @@ alpine-3.12-arm64-rootfs-export:
tags:
- arm64
-kernel-5.9.9-arm64-export:
- extends: .test-jobs-artifact-common
- image:
registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.9.9-arm64v8
- script:
- - mkdir binaries && cp /Image binaries/Image
- artifacts:
- paths:
- - binaries/Image
- tags:
- - arm64
-
kernel-5.19-arm64-export:
extends: .test-jobs-artifact-common
image:
registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 2eb6c3866e2c..07209820b474 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -34,7 +34,7 @@ qemu-alpine-arm64-gcc:
needs:
- alpine-3.12-gcc-arm64
- alpine-3.12-arm64-rootfs-export
- - kernel-5.9.9-arm64-export
+ - kernel-5.19-arm64-export
- qemu-system-aarch64-6.0.0-arm64-export
artifacts:
paths:
diff --git a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile
b/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile
deleted file mode 100644
index 053d65a3454e..000000000000
--- a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM arm64v8/debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@lists.xenproject.org"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV LINUX_VERSION=5.9.9
-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 \
- && \
- \
- # Build the kernel
- curl -fsSLO
https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \
- tar xvJf linux-"$LINUX_VERSION".tar.xz && \
- cd linux-"$LINUX_VERSION" && \
- make defconfig && \
- 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.25.1
