|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container
commit f1e4efafd69ac5022f2561e45f2eaf89388dc9f6
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
AuthorDate: Fri Apr 15 17:17:00 2022 -0700
Commit: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
CommitDate: Thu Apr 21 16:17:20 2022 -0700
gitlab-ci: add qemu-system-arm to the existing tests-artifacts container
Add qemu-system-arm to the existing test-artifacts qemu container (which
doesn't get build for every iteration but only updated once in a while.)
With qemu-system-arm available, we'll be able to run ARM32 tests.
This patch also bumps the QEMU version to v6.0.0 for both arm32 and
arm64 (the test-artifacts container is one, shared for both).
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
automation/gitlab-ci/build.yaml | 14 +++-
automation/gitlab-ci/test.yaml | 4 +-
.../qemu-system-aarch64/5.2.0-arm64v8.dockerfile | 75 ---------------------
.../qemu-system-aarch64/6.0.0-arm64v8.dockerfile | 76 ++++++++++++++++++++++
4 files changed, 90 insertions(+), 79 deletions(-)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index cc36428cf5..72f2a317ac 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -591,9 +591,9 @@ kernel-5.9.9-arm64-export:
tags:
- arm64
-qemu-system-aarch64-5.2.0-arm64-export:
+qemu-system-aarch64-6.0.0-arm64-export:
stage: build
- image:
registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:5.2.0-arm64v8
+ image:
registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
script:
- mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64
artifacts:
@@ -602,6 +602,16 @@ qemu-system-aarch64-5.2.0-arm64-export:
tags:
- arm64
+qemu-system-aarch64-6.0.0-arm32-export:
+ stage: build
+ image:
registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
+ script:
+ - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm
+ artifacts:
+ paths:
+ - binaries/qemu-system-arm
+ tags:
+ - arm64
# x86_64 test artifacts
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 47e8704df3..ec2a2e1607 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -33,7 +33,7 @@ qemu-alpine-arm64-gcc:
- alpine-3.12-gcc-arm64
- alpine-3.12-arm64-rootfs-export
- kernel-5.9.9-arm64-export
- - qemu-system-aarch64-5.2.0-arm64-export
+ - qemu-system-aarch64-6.0.0-arm64-export
artifacts:
paths:
- smoke.serial
@@ -81,7 +81,7 @@ qemu-smoke-arm64-gcc:
dependencies:
- debian-unstable-gcc-arm64
- kernel-5.9.9-arm64-export
- - qemu-system-aarch64-5.2.0-arm64-export
+ - qemu-system-aarch64-6.0.0-arm64-export
artifacts:
paths:
- smoke.serial
diff --git
a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
deleted file mode 100644
index e105a1c636..0000000000
--- a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM arm64v8/debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV QEMU_VERSION=5.2.0
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- curl \
- python3 \
- ninja-build \
- pkg-config \
- libglib2.0-dev \
- libpixman-1-dev \
- && \
- \
- curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \
- tar xvJf qemu-"$QEMU_VERSION".tar.xz && \
- cd qemu-"$QEMU_VERSION" && \
- ./configure \
- --target-list=aarch64-softmmu \
- --enable-system \
- --disable-blobs \
- --disable-bsd-user \
- --disable-debug-info \
- --disable-glusterfs \
- --disable-gtk \
- --disable-guest-agent \
- --disable-linux-user \
- --disable-sdl \
- --disable-spice \
- --disable-tpm \
- --disable-vhost-net \
- --disable-vhost-scsi \
- --disable-vhost-user \
- --disable-vhost-vsock \
- --disable-virtfs \
- --disable-vnc \
- --disable-werror \
- --disable-xen \
- --disable-safe-stack \
- --disable-libssh \
- --disable-opengl \
- --disable-tools \
- --disable-virglrenderer \
- --disable-stack-protector \
- --disable-containers \
- --disable-replication \
- --disable-cloop \
- --disable-dmg \
- --disable-vvfat \
- --disable-vdi \
- --disable-parallels \
- --disable-qed \
- --disable-bochs \
- --disable-qom-cast-debug \
- --disable-vhost-vdpa \
- --disable-vhost-kernel \
- --disable-qcow1 \
- --disable-live-block-migration \
- && \
- make -j$(nproc) && \
- cp ./build/qemu-system-aarch64 / && \
- cd /build && \
- rm -rf qemu-"$QEMU_VERSION"* && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git
a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
new file mode 100644
index 0000000000..793432d40b
--- /dev/null
+++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
@@ -0,0 +1,76 @@
+FROM arm64v8/debian:unstable
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV QEMU_VERSION=6.0.0
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ curl \
+ python3 \
+ ninja-build \
+ pkg-config \
+ libglib2.0-dev \
+ libpixman-1-dev \
+ && \
+ \
+ curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \
+ tar xvJf qemu-"$QEMU_VERSION".tar.xz && \
+ cd qemu-"$QEMU_VERSION" && \
+ ./configure \
+ --target-list=arm-softmmu,aarch64-softmmu \
+ --enable-system \
+ --disable-blobs \
+ --disable-bsd-user \
+ --disable-debug-info \
+ --disable-glusterfs \
+ --disable-gtk \
+ --disable-guest-agent \
+ --disable-linux-user \
+ --disable-sdl \
+ --disable-spice \
+ --disable-tpm \
+ --disable-vhost-net \
+ --disable-vhost-scsi \
+ --disable-vhost-user \
+ --disable-vhost-vsock \
+ --disable-virtfs \
+ --disable-vnc \
+ --disable-werror \
+ --disable-xen \
+ --disable-safe-stack \
+ --disable-libssh \
+ --disable-opengl \
+ --disable-tools \
+ --disable-virglrenderer \
+ --disable-stack-protector \
+ --disable-containers \
+ --disable-replication \
+ --disable-cloop \
+ --disable-dmg \
+ --disable-vvfat \
+ --disable-vdi \
+ --disable-parallels \
+ --disable-qed \
+ --disable-bochs \
+ --disable-qom-cast-debug \
+ --disable-vhost-vdpa \
+ --disable-vhost-kernel \
+ --disable-qcow1 \
+ --disable-live-block-migration \
+ && \
+ make -j$(nproc) && \
+ cp ./build/qemu-system-aarch64 / && \
+ cp ./build/qemu-system-arm / && \
+ cd /build && \
+ rm -rf qemu-"$QEMU_VERSION"* && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |