From: Stefano Stabellini <sstabellini@kernel.org>
To: xen-devel@lists.xenproject.org
Cc: sstabellini@kernel.org, cardoe@cardoe.com, wl@xen.org,
andrew.cooper3@citrix.com, anthony.perard@citrix.com,
bertrand.marquis@arm.com,
Stefano Stabellini <stefano.stabellini@xilinx.com>
Subject: [PATCH v2 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container
Date: Wed, 16 Mar 2022 18:46:52 -0700 [thread overview]
Message-ID: <20220317014653.2427386-1-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.22.394.2203161843230.3497@ubuntu-linux-20-04-desktop>
From: Stefano Stabellini <stefano.stabellini@xilinx.com>
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@xilinx.com>
---
automation/gitlab-ci/build.yaml | 14 ++++++++++++--
automation/gitlab-ci/test.yaml | 4 ++--
...arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} | 5 +++--
3 files changed, 17 insertions(+), 6 deletions(-)
rename automation/tests-artifacts/qemu-system-aarch64/{5.2.0-arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} (95%)
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/6.0.0-arm64v8.dockerfile
similarity index 95%
rename from automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
rename to automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
index e105a1c636..793432d40b 100644
--- a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
+++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
ENV DEBIAN_FRONTEND=noninteractive
-ENV QEMU_VERSION=5.2.0
+ENV QEMU_VERSION=6.0.0
ENV USER root
RUN mkdir /build
@@ -25,7 +25,7 @@ RUN apt-get update && \
tar xvJf qemu-"$QEMU_VERSION".tar.xz && \
cd qemu-"$QEMU_VERSION" && \
./configure \
- --target-list=aarch64-softmmu \
+ --target-list=arm-softmmu,aarch64-softmmu \
--enable-system \
--disable-blobs \
--disable-bsd-user \
@@ -68,6 +68,7 @@ RUN apt-get update && \
&& \
make -j$(nproc) && \
cp ./build/qemu-system-aarch64 / && \
+ cp ./build/qemu-system-arm / && \
cd /build && \
rm -rf qemu-"$QEMU_VERSION"* && \
apt-get autoremove -y && \
--
2.25.1
next prev parent reply other threads:[~2022-03-17 1:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-17 1:46 [PATCH v2 0/2] automation: qemu32 smoke test Stefano Stabellini
2022-03-17 1:46 ` Stefano Stabellini [this message]
2022-03-18 15:20 ` [PATCH v2 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container Anthony PERARD
2022-03-19 0:15 ` Stefano Stabellini
2022-03-17 1:46 ` [PATCH v2 2/2] gitlab-ci: add an ARM32 qemu-based smoke test Stefano Stabellini
2022-03-18 15:58 ` Anthony PERARD
2022-03-19 0:19 ` Stefano Stabellini
2022-03-19 0:24 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220317014653.2427386-1-sstabellini@kernel.org \
--to=sstabellini@kernel.org \
--cc=andrew.cooper3@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=bertrand.marquis@arm.com \
--cc=cardoe@cardoe.com \
--cc=stefano.stabellini@xilinx.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.