* [PULL 0/9] testing updates (back to green!)
@ 2023-09-15 15:08 Alex Bennée
2023-09-15 15:08 ` [PULL 1/9] tests: update Debian images to Bookworm Alex Bennée
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée
The following changes since commit 005ad32358f12fe9313a4a01918a55e60d4f39e5:
Merge tag 'pull-tpm-2023-09-12-3' of https://github.com/stefanberger/qemu-tpm into staging (2023-09-13 13:41:57 -0400)
are available in the Git repository at:
https://gitlab.com/stsquad/qemu.git tags/pull-maintainer-ominbus-150923-1
for you to fetch changes up to 5acd4bf25dc9becd05b8772b94982722e1fa76a3:
tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 (2023-09-15 15:17:52 +0100)
----------------------------------------------------------------
testing updates:
- update most Debian to bookworm
- fix some typos
- update loongarch toolchain
- fix microbit test
- handle GitLab/Cirrus timeout discrepancy
- improve avocado console handling
- disable mips avocado images pending bugfix
----------------------------------------------------------------
Alex Bennée (2):
tests: update Debian images to Bookworm
gitlab: fix typo/spelling in comments
Daniel P. Berrangé (4):
microbit: add missing qtest_quit() call
qtest: kill orphaned qtest QEMU processes on FreeBSD
gitlab: make Cirrus CI timeout explicit
gitlab: make Cirrus CI jobs gating
Nicholas Piggin (1):
tests/avocado: Fix console data loss
Philippe Mathieu-Daudé (1):
tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
Richard Henderson (1):
tests/docker: Update docker-loongarch-cross toolchain
tests/qtest/libqtest.c | 7 +++++++
tests/qtest/microbit-test.c | 2 ++
.gitlab-ci.d/base.yml | 2 +-
.gitlab-ci.d/cirrus.yml | 4 +++-
.gitlab-ci.d/cirrus/build.yml | 2 ++
python/qemu/machine/machine.py | 19 +++++++++++++++++++
tests/avocado/avocado_qemu/__init__.py | 2 +-
tests/avocado/boot_linux_console.py | 7 +++++++
tests/avocado/machine_mips_malta.py | 6 ++++++
tests/avocado/replay_kernel.py | 7 +++++++
tests/avocado/tuxrun_baselines.py | 4 ++++
tests/docker/dockerfiles/debian-amd64-cross.docker | 10 +++-------
tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
tests/docker/dockerfiles/debian-arm64-cross.docker | 10 +++-------
tests/docker/dockerfiles/debian-armel-cross.docker | 10 +++-------
tests/docker/dockerfiles/debian-armhf-cross.docker | 10 +++-------
.../docker/dockerfiles/debian-loongarch-cross.docker | 2 +-
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
tests/docker/dockerfiles/debian-s390x-cross.docker | 10 +++-------
tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 18 +++++++++---------
23 files changed, 93 insertions(+), 65 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PULL 1/9] tests: update Debian images to Bookworm
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 2/9] gitlab: fix typo/spelling in comments Alex Bennée
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Beraldo Leal
Bookworm has been out a while now. Time to update our containers to
the current stable. This requires the latest lcitool repo so update
the sub-module too.
For some reason the MIPs containers won't build so skip those for now.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-2-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index b66b9cc191..abbf45d402 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-x86-64-linux-gnu \
gcc-x86-64-linux-gnu \
libaio-dev:amd64 \
- libasan5:amd64 \
+ libasan6:amd64 \
libasound2-dev:amd64 \
libattr1-dev:amd64 \
libbpf-dev:amd64 \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index 02262bc70e..a60afa2166 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all debian-11 qemu
+# $ lcitool dockerfile --layers all debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libaio-dev \
- libasan5 \
+ libasan6 \
libasound2-dev \
libattr1-dev \
libbpf-dev \
@@ -115,11 +115,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -145,8 +143,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index a0a968b8c6..64cf42728b 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-aarch64-linux-gnu \
gcc-aarch64-linux-gnu \
libaio-dev:arm64 \
- libasan5:arm64 \
+ libasan6:arm64 \
libasound2-dev:arm64 \
libattr1-dev:arm64 \
libbpf-dev:arm64 \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index f1fc34a28a..de72903fb2 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch armv6l debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-arm-linux-gnueabi \
gcc-arm-linux-gnueabi \
libaio-dev:armel \
- libasan5:armel \
+ libasan6:armel \
libasound2-dev:armel \
libattr1-dev:armel \
libbpf-dev:armel \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index a278578211..2274f3d005 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch armv7l debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch armv7l debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-arm-linux-gnueabihf \
gcc-arm-linux-gnueabihf \
libaio-dev:armhf \
- libasan5:armhf \
+ libasan6:armhf \
libasound2-dev:armhf \
libattr1-dev:armhf \
libbpf-dev:armhf \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 30e5efa986..bb9e88c7b3 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-powerpc64le-linux-gnu \
gcc-powerpc64le-linux-gnu \
libaio-dev:ppc64el \
- libasan5:ppc64el \
+ libasan6:ppc64el \
libasound2-dev:ppc64el \
libattr1-dev:ppc64el \
libbpf-dev:ppc64el \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index ee6db7b526..503d466dbc 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch s390x debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch s390x debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -47,11 +47,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
@@ -67,8 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -84,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
g++-s390x-linux-gnu \
gcc-s390x-linux-gnu \
libaio-dev:s390x \
- libasan5:s390x \
+ libasan6:s390x \
libasound2-dev:s390x \
libattr1-dev:s390x \
libbpf-dev:s390x \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 4180cd8674..d3e212060c 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libaio-dev \
- libasan5 \
+ libasan6 \
libasound2-dev \
libattr1-dev \
libbrlapi-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index 88493f00f6..94c2c16118 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libaio-dev \
- libasan5 \
+ libasan6 \
libasound2-dev \
libattr1-dev \
libbpf-dev \
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index bbd55b4d18..e6c1d040f6 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit bbd55b4d18cce8f89b5167675e434a6941315634
+Subproject commit e6c1d040f66e5badf4bd1ab54d98a534c6510f5e
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 4584870ea1..8b1adfbdfb 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -93,7 +93,7 @@ def generate_pkglist(vm, target):
# Netmap still needs to be manually built as it is yet to be packaged
# into a distro. We also add cscope and gtags which are used in the CI
# test
-debian11_extras = [
+debian12_extras = [
"# netmap/cscope/global\n",
"RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
" apt install -y --no-install-recommends \\\n",
@@ -123,8 +123,8 @@ try:
#
generate_dockerfile("alpine", "alpine-318")
generate_dockerfile("centos8", "centos-stream-8")
- generate_dockerfile("debian-amd64", "debian-11",
- trailer="".join(debian11_extras))
+ generate_dockerfile("debian-amd64", "debian-12",
+ trailer="".join(debian12_extras))
generate_dockerfile("fedora", "fedora-38")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2004", "ubuntu-2004")
@@ -133,24 +133,24 @@ try:
#
# Cross compiling builds
#
- generate_dockerfile("debian-amd64-cross", "debian-11",
+ generate_dockerfile("debian-amd64-cross", "debian-12",
cross="x86_64",
trailer=cross_build("x86_64-linux-gnu-",
"x86_64-softmmu,"
"x86_64-linux-user,"
"i386-softmmu,i386-linux-user"))
- generate_dockerfile("debian-arm64-cross", "debian-11",
+ generate_dockerfile("debian-arm64-cross", "debian-12",
cross="aarch64",
trailer=cross_build("aarch64-linux-gnu-",
"aarch64-softmmu,aarch64-linux-user"))
- generate_dockerfile("debian-armel-cross", "debian-11",
+ generate_dockerfile("debian-armel-cross", "debian-12",
cross="armv6l",
trailer=cross_build("arm-linux-gnueabi-",
"arm-softmmu,arm-linux-user,armeb-linux-user"))
- generate_dockerfile("debian-armhf-cross", "debian-11",
+ generate_dockerfile("debian-armhf-cross", "debian-12",
cross="armv7l",
trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user"))
@@ -165,7 +165,7 @@ try:
trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user"))
- generate_dockerfile("debian-ppc64el-cross", "debian-11",
+ generate_dockerfile("debian-ppc64el-cross", "debian-12",
cross="ppc64le",
trailer=cross_build("powerpc64le-linux-gnu-",
"ppc64-softmmu,ppc64-linux-user"))
@@ -176,7 +176,7 @@ try:
trailer=cross_build("riscv64-linux-gnu-",
"riscv64-softmmu,riscv64-linux-user"))
- generate_dockerfile("debian-s390x-cross", "debian-11",
+ generate_dockerfile("debian-s390x-cross", "debian-12",
cross="s390x",
trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user"))
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 2/9] gitlab: fix typo/spelling in comments
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
2023-09-15 15:08 ` [PULL 1/9] tests: update Debian images to Bookworm Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 3/9] tests/docker: Update docker-loongarch-cross toolchain Alex Bennée
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Thomas Huth, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Beraldo Leal
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-3-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml
index 188a770799..ef173a34e6 100644
--- a/.gitlab-ci.d/base.yml
+++ b/.gitlab-ci.d/base.yml
@@ -68,7 +68,7 @@ variables:
#############################################################
# Stage 2: fine tune execution of jobs in specific scenarios
- # where the catch all logic is inapprorpaite
+ # where the catch all logic is inappropriate
#############################################################
# Optional jobs should not be run unless manually triggered
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 3/9] tests/docker: Update docker-loongarch-cross toolchain
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
2023-09-15 15:08 ` [PULL 1/9] tests: update Debian images to Bookworm Alex Bennée
2023-09-15 15:08 ` [PULL 2/9] gitlab: fix typo/spelling in comments Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 4/9] microbit: add missing qtest_quit() call Alex Bennée
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Song Gao, Alex Bennée,
Philippe Mathieu-Daudé, Thomas Huth,
Wainer dos Santos Moschetta, Beraldo Leal
From: Richard Henderson <richard.henderson@linaro.org>
Update from clfs 5.0 to clfs 8.1, which includes updates
to binutils 2.41, gcc 13.2, and glibc 2.38.
See https://github.com/loongson/build-tools
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230829220228.928506-2-richard.henderson@linaro.org>
Message-Id: <20230914155422.426639-4-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker
index 9d957547b5..b4bf265717 100644
--- a/tests/docker/dockerfiles/debian-loongarch-cross.docker
+++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker
@@ -20,7 +20,7 @@ RUN apt-get update && \
git \
python3-minimal
-RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2022.05.29/loongarch64-clfs-5.0-cross-tools-gcc-glibc.tar.xz \
+RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2023.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \
| tar -xJC /opt
ENV PATH $PATH:/opt/cross-tools/bin
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 4/9] microbit: add missing qtest_quit() call
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (2 preceding siblings ...)
2023-09-15 15:08 ` [PULL 3/9] tests/docker: Update docker-loongarch-cross toolchain Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Alex Bennée
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé, Richard Henderson, Stefan Hajnoczi,
Thomas Huth, Alex Bennée, Joel Stanley, Peter Maydell,
Laurent Vivier, Paolo Bonzini, open list:NRF51
From: Daniel P. Berrangé <berrange@redhat.com>
Without this call, the QEMU process is being left running which on
FreeBSD 13.2 at least, makes meson think the test is still running,
and thus execution of "make check" continues forever.
This fixes the regression introduced in:
commit a9c9bbee855877293683012942d3485d50f286af
Author: Chris Laplante <chris@laplante.io>
Date: Tue Aug 22 17:31:02 2023 +0100
qtest: microbit-test: add tests for nRF51 DETECT
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1882
Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230912184130.3056054-2-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-5-alex.bennee@linaro.org>
diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
index 2abcad8e31..72190d38f7 100644
--- a/tests/qtest/microbit-test.c
+++ b/tests/qtest/microbit-test.c
@@ -434,6 +434,8 @@ static void test_nrf51_gpio_detect(void)
g_assert_true(qtest_get_irq(qts, 0));
qtest_set_irq_in(qts, "/machine/nrf51", "unnamed-gpio-in", 3, 0);
g_assert_true(qtest_get_irq(qts, 0));
+
+ qtest_quit(qts);
}
static void timer_task(QTestState *qts, hwaddr task)
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (3 preceding siblings ...)
2023-09-15 15:08 ` [PULL 4/9] microbit: add missing qtest_quit() call Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 6/9] gitlab: make Cirrus CI timeout explicit Alex Bennée
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé, Richard Henderson, Stefan Hajnoczi,
Thomas Huth, Alex Bennée, Laurent Vivier, Paolo Bonzini
From: Daniel P. Berrangé <berrange@redhat.com>
On Linux we use PR_SET_PDEATHSIG to kill orphaned QEMU processes
if we fail to call qtest_quit(), or the test program aborts/segvs.
This prevents meson from hanging forever due to the orphaned
process keeping stdout open.
On FreeBSD we can achieve the same using PROC_PDEATHSIG_CTL, which
gives us the equivalent protection against hangs.
Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230912184130.3056054-3-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-6-alex.bennee@linaro.org>
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 34b9c14b75..b1eba71ffe 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -24,6 +24,9 @@
#ifdef __linux__
#include <sys/prctl.h>
#endif /* __linux__ */
+#ifdef __FreeBSD__
+#include <sys/procctl.h>
+#endif /* __FreeBSD__ */
#include "libqtest.h"
#include "libqmp.h"
@@ -414,6 +417,10 @@ static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu(const char *fmt, ...)
*/
prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
#endif /* __linux__ */
+#ifdef __FreeBSD__
+ int sig = SIGKILL;
+ procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig);
+#endif /* __FreeBSD__ */
if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) {
exit(1);
}
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 6/9] gitlab: make Cirrus CI timeout explicit
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (4 preceding siblings ...)
2023-09-15 15:08 ` [PULL 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 7/9] gitlab: make Cirrus CI jobs gating Alex Bennée
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé, Philippe Mathieu-Daudé,
Stefan Hajnoczi, Thomas Huth, Alex Bennée,
Wainer dos Santos Moschetta, Beraldo Leal
From: Daniel P. Berrangé <berrange@redhat.com>
On the GitLab side we're invoking the Cirrus CI job using the
cirrus-run tool which speaks to the Cirrus REST API. Cirrus
sometimes tasks 5-10 minutes to actually schedule the task,
and thus the execution time of 'cirrus-run' inside GitLab will
be slightly longer than the execution time of the Cirrus CI
task.
Setting the timeout in the GitLab CI job should thus be done
in relation to the timeout set for the Cirrus CI job. While
Cirrus CI defaults to 60 minutes, it is better to set this
explicitly, and make the relationship between the jobs
explicit
Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230912184130.3056054-4-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-7-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 41d64d6680..816d89cc2a 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -15,6 +15,9 @@
stage: build
image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
needs: []
+ # 20 mins larger than "timeout_in" in cirrus/build.yml
+ # as there's often a 5-10 minute delay before Cirrus CI
+ # actually starts the task
timeout: 80m
allow_failure: true
script:
diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml
index a9444902ec..29d55c4aa3 100644
--- a/.gitlab-ci.d/cirrus/build.yml
+++ b/.gitlab-ci.d/cirrus/build.yml
@@ -16,6 +16,8 @@ env:
TEST_TARGETS: "@TEST_TARGETS@"
build_task:
+ # A little shorter than GitLab timeout in ../cirrus.yml
+ timeout_in: 60m
install_script:
- @UPDATE_COMMAND@
- @INSTALL_COMMAND@ @PKGS@
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 7/9] gitlab: make Cirrus CI jobs gating
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (5 preceding siblings ...)
2023-09-15 15:08 ` [PULL 6/9] gitlab: make Cirrus CI timeout explicit Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 8/9] tests/avocado: Fix console data loss Alex Bennée
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P. Berrangé, Stefan Hajnoczi, Thomas Huth,
Philippe Mathieu-Daudé, Alex Bennée,
Wainer dos Santos Moschetta, Beraldo Leal
From: Daniel P. Berrangé <berrange@redhat.com>
The Cirrus CI jobs have been non-gating for a while to let us build
confidence in their reliability. Aside from periodic dependancy
problems when FreeBSD Ports switches to be based on a new FreeBSD
image version, the jobs have been reliable. It is thus worth making
them gating to prevent build failures being missed during merges.
Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230912184130.3056054-5-berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-8-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 816d89cc2a..e7f1f83c2c 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -19,7 +19,6 @@
# as there's often a 5-10 minute delay before Cirrus CI
# actually starts the task
timeout: 80m
- allow_failure: true
script:
- source .gitlab-ci.d/cirrus/$NAME.vars
- sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g"
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 8/9] tests/avocado: Fix console data loss
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (6 preceding siblings ...)
2023-09-15 15:08 ` [PULL 7/9] gitlab: make Cirrus CI jobs gating Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-15 15:08 ` [PULL 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 Alex Bennée
2023-09-18 13:47 ` [PULL 0/9] testing updates (back to green!) Stefan Hajnoczi
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Nicholas Piggin, Daniel P. Berrangé,
Philippe Mathieu-Daudé, John Snow, Alex Bennée,
Cleber Rosa, Beraldo Leal, Wainer dos Santos Moschetta
From: Nicholas Piggin <npiggin@gmail.com>
Occasionally some avocado tests will fail waiting for console line
despite the machine running correctly. Console data goes missing, as can
be seen in the console log. This is due to _console_interaction calling
makefile() on the console socket each time it is invoked, which must be
losing old buffer contents when going out of scope.
It is not enough to makefile() with buffered=0. That helps significantly
but data loss is still possible. My guess is that readline() has a line
buffer even when the file is in unbuffered mode, that can eat data.
Fix this by providing a console file that persists for the life of the
console.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com>
Message-Id: <20230912131340.405619-1-npiggin@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-9-alex.bennee@linaro.org>
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index c16a0b6fed..35d5a672db 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -191,6 +191,7 @@ def __init__(self,
self.sock_dir, f"{self._name}.con"
)
self._console_socket: Optional[socket.socket] = None
+ self._console_file: Optional[socket.SocketIO] = None
self._remove_files: List[str] = []
self._user_killed = False
self._quit_issued = False
@@ -509,6 +510,11 @@ def _early_cleanup(self) -> None:
# If we keep the console socket open, we may deadlock waiting
# for QEMU to exit, while QEMU is waiting for the socket to
# become writable.
+ if self._console_file is not None:
+ LOG.debug("Closing console file")
+ self._console_file.close()
+ self._console_file = None
+
if self._console_socket is not None:
LOG.debug("Closing console socket")
self._console_socket.close()
@@ -874,12 +880,25 @@ def console_socket(self) -> socket.socket:
Returns a socket connected to the console
"""
if self._console_socket is None:
+ LOG.debug("Opening console socket")
self._console_socket = console_socket.ConsoleSocket(
self._console_address,
file=self._console_log_path,
drain=self._drain_console)
return self._console_socket
+ @property
+ def console_file(self) -> socket.SocketIO:
+ """
+ Returns a file associated with the console socket
+ """
+ if self._console_file is None:
+ LOG.debug("Opening console file")
+ self._console_file = self.console_socket.makefile(mode='rb',
+ buffering=0,
+ encoding='utf-8')
+ return self._console_file
+
@property
def temp_dir(self) -> str:
"""
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py
index 33090903f1..0172a359b7 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -137,7 +137,7 @@ def _console_interaction(test, success_message, failure_message,
assert not keep_sending or send_string
if vm is None:
vm = test.vm
- console = vm.console_socket.makefile(mode='rb', encoding='utf-8')
+ console = vm.console_file
console_logger = logging.getLogger('console')
while True:
if send_string:
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PULL 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (7 preceding siblings ...)
2023-09-15 15:08 ` [PULL 8/9] tests/avocado: Fix console data loss Alex Bennée
@ 2023-09-15 15:08 ` Alex Bennée
2023-09-18 13:47 ` [PULL 0/9] testing updates (back to green!) Stefan Hajnoczi
9 siblings, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-15 15:08 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Thomas Huth, Alex Bennée,
Cleber Rosa, Wainer dos Santos Moschetta, Beraldo Leal,
Aurelien Jarno, Pavel Dovgalyuk, Paolo Bonzini, Jiaxun Yang
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Commit 0d58c66068 ("softmmu: Use async_run_on_cpu in tcg_commit")
introduced a regression which is only triggered by the MIPS Malta
machine. Since those tests are gatting and disturb the CI workflow,
disable them until https://gitlab.com/qemu-project/qemu/-/issues/1866
is fixed.
$ make check-avocado \
AVOCADO_TAGS='arch:mipsel arch:mips64el' \
AVOCADO_ALLOW_UNTRUSTED_CODE=1 \
AVOCADO_TIMEOUT_EXPECTED=1
AVOCADO tests/avocado
(04/24) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_mips_malta32el_nanomips_4k: INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout reached\nOriginal status: ERROR\n... (90.39 s)
(05/24) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_mips_malta32el_nanomips_16k_up: INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout reached\nOriginal status: ERROR\n... (90.29 s)
(06/24) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_mips_malta32el_nanomips_64k_dbg: INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout reached\nOriginal status: ERROR\n... (92.53 s)
(11/24) tests/avocado/machine_mips_malta.py:MaltaMachineFramebuffer.test_mips_malta_i6400_framebuffer_logo_1core: INTERRUPTED: Test interrupted by SIGTERM\nRunner error occurred: Timeout reached\nOriginal status: ERROR\n... (25.78 s)
RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 7 | WARN 2 | INTERRUPT 5 | CANCEL 2
JOB TIME : 525.60 s ^^^^^^^^^^^
Reported-by: Thomas Huth <thuth@redhat.com>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230913135339.9128-1-philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230914155422.426639-10-alex.bennee@linaro.org>
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 6eab515718..01ee149812 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -116,6 +116,7 @@ def test_x86_64_pc(self):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta(self):
"""
:avocado: tags=arch:mips
@@ -138,6 +139,7 @@ def test_mips_malta(self):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta(self):
"""
This test requires the ar tool to extract "data.tar.gz" from
@@ -191,6 +193,7 @@ def test_mips64el_fuloong2e(self):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_cpio(self):
"""
:avocado: tags=arch:mips
@@ -232,6 +235,7 @@ def test_mips_malta_cpio(self):
# Wait for VM to shut down gracefully
self.vm.wait()
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
def test_mips64el_malta_5KEc_cpio(self):
"""
@@ -292,6 +296,7 @@ def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_4k(self):
"""
:avocado: tags=arch:mipsel
@@ -305,6 +310,7 @@ def test_mips_malta32el_nanomips_4k(self):
kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6'
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_16k_up(self):
"""
:avocado: tags=arch:mipsel
@@ -318,6 +324,7 @@ def test_mips_malta32el_nanomips_16k_up(self):
kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc'
self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_64k_dbg(self):
"""
:avocado: tags=arch:mipsel
diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py
index 92233451c5..3620266589 100644
--- a/tests/avocado/machine_mips_malta.py
+++ b/tests/avocado/machine_mips_malta.py
@@ -11,6 +11,7 @@
import gzip
import logging
+from avocado import skip
from avocado import skipIf
from avocado import skipUnless
from avocado.utils import archive
@@ -93,6 +94,7 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
cv2.imwrite(debug_png, screendump_bgr)
self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_i6400_framebuffer_logo_1core(self):
"""
:avocado: tags=arch:mips64el
@@ -101,6 +103,7 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self):
"""
self.do_test_i6400_framebuffer_logo(1)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_mips_malta_i6400_framebuffer_logo_7cores(self):
"""
@@ -111,6 +114,7 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self):
"""
self.do_test_i6400_framebuffer_logo(7)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_mips_malta_i6400_framebuffer_logo_8cores(self):
"""
@@ -142,6 +146,7 @@ def do_test_yamon(self):
wait_for_console_pattern(self, prompt)
self.vm.shutdown()
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mipsel_malta_yamon(self):
"""
:avocado: tags=arch:mipsel
@@ -150,6 +155,7 @@ def test_mipsel_malta_yamon(self):
"""
self.do_test_yamon()
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta_yamon(self):
"""
:avocado: tags=arch:mips64el
diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
index a18610542e..f7ccfd2462 100644
--- a/tests/avocado/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
@@ -98,6 +98,7 @@ def test_x86_64_pc(self):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta(self):
"""
:avocado: tags=arch:mips
@@ -116,6 +117,7 @@ def test_mips_malta(self):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el_malta(self):
"""
This test requires the ar tool to extract "data.tar.gz" from
@@ -431,6 +433,7 @@ class ReplayKernelSlow(ReplayKernelBase):
# making it very slow.
timeout = 180
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta_cpio(self):
"""
:avocado: tags=arch:mips
@@ -460,6 +463,7 @@ def test_mips_malta_cpio(self):
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5,
args=('-initrd', initrd_path))
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
def test_mips64el_malta_5KEc_cpio(self):
"""
@@ -502,6 +506,7 @@ def do_test_mips_malta32el_nanomips(self, kernel_path_xz):
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_4k(self):
"""
:avocado: tags=arch:mipsel
@@ -516,6 +521,7 @@ def test_mips_malta32el_nanomips_4k(self):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.do_test_mips_malta32el_nanomips(kernel_path_xz)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_16k_up(self):
"""
:avocado: tags=arch:mipsel
@@ -530,6 +536,7 @@ def test_mips_malta32el_nanomips_16k_up(self):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.do_test_mips_malta32el_nanomips(kernel_path_xz)
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips_malta32el_nanomips_64k_dbg(self):
"""
:avocado: tags=arch:mipsel
diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
index e12250eabb..610b7e2bfa 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -352,6 +352,7 @@ def test_i386(self):
self.common_tuxrun(csums=sums, drive="virtio-blk-pci")
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips32(self):
"""
:avocado: tags=arch:mips
@@ -370,6 +371,7 @@ def test_mips32(self):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips32el(self):
"""
:avocado: tags=arch:mipsel
@@ -387,6 +389,7 @@ def test_mips32el(self):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64(self):
"""
:avocado: tags=arch:mips64
@@ -404,6 +407,7 @@ def test_mips64(self):
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
+ @skip('https://gitlab.com/qemu-project/qemu/-/issues/1884')
def test_mips64el(self):
"""
:avocado: tags=arch:mips64el
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PULL 0/9] testing updates (back to green!)
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
` (8 preceding siblings ...)
2023-09-15 15:08 ` [PULL 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 Alex Bennée
@ 2023-09-18 13:47 ` Stefan Hajnoczi
2023-09-18 15:23 ` Alex Bennée
2023-09-19 6:37 ` Alex Bennée
9 siblings, 2 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2023-09-18 13:47 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel
On Fri, 15 Sept 2023 at 11:10, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 005ad32358f12fe9313a4a01918a55e60d4f39e5:
>
> Merge tag 'pull-tpm-2023-09-12-3' of https://github.com/stefanberger/qemu-tpm into staging (2023-09-13 13:41:57 -0400)
>
> are available in the Git repository at:
>
> https://gitlab.com/stsquad/qemu.git tags/pull-maintainer-ominbus-150923-1
>
> for you to fetch changes up to 5acd4bf25dc9becd05b8772b94982722e1fa76a3:
>
> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 (2023-09-15 15:17:52 +0100)
>
> ----------------------------------------------------------------
> testing updates:
>
> - update most Debian to bookworm
This breaks the armel-debian-cross-container job:
https://gitlab.com/qemu-project/qemu/-/jobs/5111108339
I have dropped this pull request for now. Please take a look.
Thanks,
Stefan
> - fix some typos
> - update loongarch toolchain
> - fix microbit test
> - handle GitLab/Cirrus timeout discrepancy
> - improve avocado console handling
> - disable mips avocado images pending bugfix
>
> ----------------------------------------------------------------
> Alex Bennée (2):
> tests: update Debian images to Bookworm
> gitlab: fix typo/spelling in comments
>
> Daniel P. Berrangé (4):
> microbit: add missing qtest_quit() call
> qtest: kill orphaned qtest QEMU processes on FreeBSD
> gitlab: make Cirrus CI timeout explicit
> gitlab: make Cirrus CI jobs gating
>
> Nicholas Piggin (1):
> tests/avocado: Fix console data loss
>
> Philippe Mathieu-Daudé (1):
> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
>
> Richard Henderson (1):
> tests/docker: Update docker-loongarch-cross toolchain
>
> tests/qtest/libqtest.c | 7 +++++++
> tests/qtest/microbit-test.c | 2 ++
> .gitlab-ci.d/base.yml | 2 +-
> .gitlab-ci.d/cirrus.yml | 4 +++-
> .gitlab-ci.d/cirrus/build.yml | 2 ++
> python/qemu/machine/machine.py | 19 +++++++++++++++++++
> tests/avocado/avocado_qemu/__init__.py | 2 +-
> tests/avocado/boot_linux_console.py | 7 +++++++
> tests/avocado/machine_mips_malta.py | 6 ++++++
> tests/avocado/replay_kernel.py | 7 +++++++
> tests/avocado/tuxrun_baselines.py | 4 ++++
> tests/docker/dockerfiles/debian-amd64-cross.docker | 10 +++-------
> tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
> tests/docker/dockerfiles/debian-arm64-cross.docker | 10 +++-------
> tests/docker/dockerfiles/debian-armel-cross.docker | 10 +++-------
> tests/docker/dockerfiles/debian-armhf-cross.docker | 10 +++-------
> .../docker/dockerfiles/debian-loongarch-cross.docker | 2 +-
> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
> tests/docker/dockerfiles/debian-s390x-cross.docker | 10 +++-------
> tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
> tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
> tests/lcitool/libvirt-ci | 2 +-
> tests/lcitool/refresh | 18 +++++++++---------
> 23 files changed, 93 insertions(+), 65 deletions(-)
>
>
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PULL 0/9] testing updates (back to green!)
2023-09-18 13:47 ` [PULL 0/9] testing updates (back to green!) Stefan Hajnoczi
@ 2023-09-18 15:23 ` Alex Bennée
2023-09-19 6:37 ` Alex Bennée
1 sibling, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-18 15:23 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
Stefan Hajnoczi <stefanha@gmail.com> writes:
> On Fri, 15 Sept 2023 at 11:10, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 005ad32358f12fe9313a4a01918a55e60d4f39e5:
>>
>> Merge tag 'pull-tpm-2023-09-12-3' of https://github.com/stefanberger/qemu-tpm into staging (2023-09-13 13:41:57 -0400)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/stsquad/qemu.git tags/pull-maintainer-ominbus-150923-1
>>
>> for you to fetch changes up to 5acd4bf25dc9becd05b8772b94982722e1fa76a3:
>>
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 (2023-09-15 15:17:52 +0100)
>>
>> ----------------------------------------------------------------
>> testing updates:
>>
>> - update most Debian to bookworm
>
> This breaks the armel-debian-cross-container job:
> https://gitlab.com/qemu-project/qemu/-/jobs/5111108339
>
> I have dropped this pull request for now. Please take a look.
Hmm I think it might be a transient Debian issue as it passed when I run
the tag before sending:
https://gitlab.com/stsquad/qemu/-/jobs/5100170183
I'll see if I can run it locally.
>
> Thanks,
> Stefan
>
>> - fix some typos
>> - update loongarch toolchain
>> - fix microbit test
>> - handle GitLab/Cirrus timeout discrepancy
>> - improve avocado console handling
>> - disable mips avocado images pending bugfix
>>
>> ----------------------------------------------------------------
>> Alex Bennée (2):
>> tests: update Debian images to Bookworm
>> gitlab: fix typo/spelling in comments
>>
>> Daniel P. Berrangé (4):
>> microbit: add missing qtest_quit() call
>> qtest: kill orphaned qtest QEMU processes on FreeBSD
>> gitlab: make Cirrus CI timeout explicit
>> gitlab: make Cirrus CI jobs gating
>>
>> Nicholas Piggin (1):
>> tests/avocado: Fix console data loss
>>
>> Philippe Mathieu-Daudé (1):
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
>>
>> Richard Henderson (1):
>> tests/docker: Update docker-loongarch-cross toolchain
>>
>> tests/qtest/libqtest.c | 7 +++++++
>> tests/qtest/microbit-test.c | 2 ++
>> .gitlab-ci.d/base.yml | 2 +-
>> .gitlab-ci.d/cirrus.yml | 4 +++-
>> .gitlab-ci.d/cirrus/build.yml | 2 ++
>> python/qemu/machine/machine.py | 19 +++++++++++++++++++
>> tests/avocado/avocado_qemu/__init__.py | 2 +-
>> tests/avocado/boot_linux_console.py | 7 +++++++
>> tests/avocado/machine_mips_malta.py | 6 ++++++
>> tests/avocado/replay_kernel.py | 7 +++++++
>> tests/avocado/tuxrun_baselines.py | 4 ++++
>> tests/docker/dockerfiles/debian-amd64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-arm64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-armel-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-armhf-cross.docker | 10 +++-------
>> .../docker/dockerfiles/debian-loongarch-cross.docker | 2 +-
>> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-s390x-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
>> tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
>> tests/lcitool/libvirt-ci | 2 +-
>> tests/lcitool/refresh | 18 +++++++++---------
>> 23 files changed, 93 insertions(+), 65 deletions(-)
>>
>>
>> --
>> 2.39.2
>>
>>
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PULL 0/9] testing updates (back to green!)
2023-09-18 13:47 ` [PULL 0/9] testing updates (back to green!) Stefan Hajnoczi
2023-09-18 15:23 ` Alex Bennée
@ 2023-09-19 6:37 ` Alex Bennée
1 sibling, 0 replies; 13+ messages in thread
From: Alex Bennée @ 2023-09-19 6:37 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
Stefan Hajnoczi <stefanha@gmail.com> writes:
> On Fri, 15 Sept 2023 at 11:10, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 005ad32358f12fe9313a4a01918a55e60d4f39e5:
>>
>> Merge tag 'pull-tpm-2023-09-12-3' of https://github.com/stefanberger/qemu-tpm into staging (2023-09-13 13:41:57 -0400)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/stsquad/qemu.git tags/pull-maintainer-ominbus-150923-1
>>
>> for you to fetch changes up to 5acd4bf25dc9becd05b8772b94982722e1fa76a3:
>>
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 (2023-09-15 15:17:52 +0100)
>>
>> ----------------------------------------------------------------
>> testing updates:
>>
>> - update most Debian to bookworm
>
> This breaks the armel-debian-cross-container job:
> https://gitlab.com/qemu-project/qemu/-/jobs/5111108339
Looks like the armel image building is broken:
https://lists.debian.org/debian-arm/2023/09/msg00006.html
So I can drop that backdown for bullseye for now.
>
> I have dropped this pull request for now. Please take a look.
>
> Thanks,
> Stefan
>
>> - fix some typos
>> - update loongarch toolchain
>> - fix microbit test
>> - handle GitLab/Cirrus timeout discrepancy
>> - improve avocado console handling
>> - disable mips avocado images pending bugfix
>>
>> ----------------------------------------------------------------
>> Alex Bennée (2):
>> tests: update Debian images to Bookworm
>> gitlab: fix typo/spelling in comments
>>
>> Daniel P. Berrangé (4):
>> microbit: add missing qtest_quit() call
>> qtest: kill orphaned qtest QEMU processes on FreeBSD
>> gitlab: make Cirrus CI timeout explicit
>> gitlab: make Cirrus CI jobs gating
>>
>> Nicholas Piggin (1):
>> tests/avocado: Fix console data loss
>>
>> Philippe Mathieu-Daudé (1):
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
>>
>> Richard Henderson (1):
>> tests/docker: Update docker-loongarch-cross toolchain
>>
>> tests/qtest/libqtest.c | 7 +++++++
>> tests/qtest/microbit-test.c | 2 ++
>> .gitlab-ci.d/base.yml | 2 +-
>> .gitlab-ci.d/cirrus.yml | 4 +++-
>> .gitlab-ci.d/cirrus/build.yml | 2 ++
>> python/qemu/machine/machine.py | 19 +++++++++++++++++++
>> tests/avocado/avocado_qemu/__init__.py | 2 +-
>> tests/avocado/boot_linux_console.py | 7 +++++++
>> tests/avocado/machine_mips_malta.py | 6 ++++++
>> tests/avocado/replay_kernel.py | 7 +++++++
>> tests/avocado/tuxrun_baselines.py | 4 ++++
>> tests/docker/dockerfiles/debian-amd64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-arm64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-armel-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-armhf-cross.docker | 10 +++-------
>> .../docker/dockerfiles/debian-loongarch-cross.docker | 2 +-
>> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-s390x-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
>> tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
>> tests/lcitool/libvirt-ci | 2 +-
>> tests/lcitool/refresh | 18 +++++++++---------
>> 23 files changed, 93 insertions(+), 65 deletions(-)
>>
>>
>> --
>> 2.39.2
>>
>>
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-09-19 6:39 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 15:08 [PULL 0/9] testing updates (back to green!) Alex Bennée
2023-09-15 15:08 ` [PULL 1/9] tests: update Debian images to Bookworm Alex Bennée
2023-09-15 15:08 ` [PULL 2/9] gitlab: fix typo/spelling in comments Alex Bennée
2023-09-15 15:08 ` [PULL 3/9] tests/docker: Update docker-loongarch-cross toolchain Alex Bennée
2023-09-15 15:08 ` [PULL 4/9] microbit: add missing qtest_quit() call Alex Bennée
2023-09-15 15:08 ` [PULL 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Alex Bennée
2023-09-15 15:08 ` [PULL 6/9] gitlab: make Cirrus CI timeout explicit Alex Bennée
2023-09-15 15:08 ` [PULL 7/9] gitlab: make Cirrus CI jobs gating Alex Bennée
2023-09-15 15:08 ` [PULL 8/9] tests/avocado: Fix console data loss Alex Bennée
2023-09-15 15:08 ` [PULL 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 Alex Bennée
2023-09-18 13:47 ` [PULL 0/9] testing updates (back to green!) Stefan Hajnoczi
2023-09-18 15:23 ` Alex Bennée
2023-09-19 6:37 ` Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).