Signed-off-by: Stefano Stabellini <stefano.stabell...@amd.com>
Reviewed-by: Michal Orzel <michal.or...@amd.com>
---
automation/gitlab-ci/build.yaml | 4 ++--
automation/gitlab-ci/test.yaml | 2 +-
.../{5.19-arm64v8.dockerfile => 6.6.74-arm64v8.dockerfile} | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
rename automation/tests-artifacts/kernel/{5.19-arm64v8.dockerfile =>
6.6.74-arm64v8.dockerfile} (90%)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index bc4a8a5ad2..411b4902b5 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -269,9 +269,9 @@ alpine-3.18-arm64-rootfs-export:
tags:
- arm64
-kernel-5.19-arm64-export:
+kernel-6.6.74-arm64-export:
extends: .test-jobs-artifact-common
- image:
registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8
+ image:
registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.6.74-arm64v8
script:
- mkdir binaries && cp /Image binaries/Image
artifacts:
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 1822e3ea5f..6ad45269ea 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -4,7 +4,7 @@
.arm64-test-needs: &arm64-test-needs
- alpine-3.18-arm64-rootfs-export
- - kernel-5.19-arm64-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/5.19-arm64v8.dockerfile
b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile
similarity index 90%
rename from automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile
rename to automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile
index 8e33995ba3..73e5145425 100644
--- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile
+++ b/automation/tests-artifacts/kernel/6.6.74-arm64v8.dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
ENV DEBIAN_FRONTEND=noninteractive
-ENV LINUX_VERSION=5.19
+ENV LINUX_VERSION=6.6.74
ENV USER root
RUN mkdir /build
@@ -18,10 +18,11 @@ RUN apt-get update && \
curl \
flex \
bison \
+ libssl-dev \
&& \
\
# Build the kernel
- curl -fsSLO
https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \
+ 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 && \
--
2.25.1
