Mailing List Archive

commit c51a823946949c229bffe0ee34be18b975ebf944
Author: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
AuthorDate: Sat Mar 25 22:11:57 2023 +0100
Commit: Stefano Stabellini <stefano.stabellini@amd.com>
CommitDate: Mon Mar 27 15:15:06 2023 -0700

automation: update x86-64 tests to Linux 6.1.19

It will be used in tests added in subsequent patches.
Enable config options needed for those tests.
While at it, migrate all the x86 tests to the newer kernel, and
introduce x86-64-test-needs to allow deduplication later (for now it's
used only once).

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
automation/gitlab-ci/build.yaml | 4 +--
automation/gitlab-ci/test.yaml | 7 ++--
.../tests-artifacts/kernel/5.10.74.dockerfile | 38 --------------------
.../tests-artifacts/kernel/6.1.19.dockerfile | 40 ++++++++++++++++++++++
4 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 820cc0af83..0817f11055 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -798,9 +798,9 @@ alpine-3.12-rootfs-export:
tags:
- x86_64

-kernel-5.10.74-export:
+kernel-6.1.19-export:
extends: .test-jobs-artifact-common
- image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.10.74
+ image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19
script:
- mkdir binaries && cp /bzImage binaries/bzImage
artifacts:
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index d75662358f..ee9e321077 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -15,6 +15,10 @@
.arm32-test-needs: &arm32-test-needs
- qemu-system-aarch64-6.0.0-arm32-export

+.x86-64-test-needs: &x86-64-test-needs
+ - alpine-3.12-rootfs-export
+ - kernel-6.1.19-export
+
.qemu-arm64:
extends: .test-jobs-common
variables:
@@ -299,9 +303,8 @@ qemu-alpine-x86_64-gcc:
script:
- ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE}
needs:
+ - *x86-64-test-needs
- alpine-3.12-gcc
- - alpine-3.12-rootfs-export
- - kernel-5.10.74-export

qemu-smoke-x86-64-gcc:
extends: .qemu-x86-64
diff --git a/automation/tests-artifacts/kernel/5.10.74.dockerfile b/automation/tests-artifacts/kernel/5.10.74.dockerfile
deleted file mode 100644
index 112e27fe45..0000000000
--- a/automation/tests-artifacts/kernel/5.10.74.dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@lists.xenproject.org"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV LINUX_VERSION=5.10.74
-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/v5.x/linux-"$LINUX_VERSION".tar.xz && \
- tar xvJf linux-"$LINUX_VERSION".tar.xz && \
- cd linux-"$LINUX_VERSION" && \
- make defconfig && \
- make xen.config && \
- 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.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile
new file mode 100644
index 0000000000..c2171555a0
--- /dev/null
+++ b/automation/tests-artifacts/kernel/6.1.19.dockerfile
@@ -0,0 +1,40 @@
+FROM debian:unstable
+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 \
+ 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"*
--
generated by git-patchbot for /home/xen/git/xen.git#master