From patchwork Thu Sep 14 15:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=JN/kLPZu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RmhkL2YPQz1yhZ for ; Fri, 15 Sep 2023 01:55:54 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogF-0002D3-8M; Thu, 14 Sep 2023 11:54:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofu-0001VR-M4 for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:39 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofl-00086s-W7 for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:38 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-31aeef88a55so956595f8f.2 for ; Thu, 14 Sep 2023 08:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706864; x=1695311664; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bTFKjAk668ydAQD60sA5QJG3NG/NYwbGYdSapTNnjEA=; b=JN/kLPZuU2oiPnhYFZfUiy+wMxnO2Mlv8qxT5eE58vRvplYWOwKh4+beAknaf9DBqB HVbHXP7NKYbVJ1lFHyyP/c5TyzhWTyEh6h7048ND2gpJl499b7xa7OBZ8EzzVeOtihcX mJONvzgOfpYPIU7vlyYDf+6Xk6cEMthnl+sSFZvOHYgY64Xx4xhgHAhI+beaoFGXENMK X0vFLxZYzZaZ8DDX0p6oO0CJZSblf/Yg0Otjsdj2bLik7Puo6KnyaOT4DMnKA74Ak3gy glSz2sK3WWIlNSn1V10PyyzZw+ZahgL61/yOo9m6FvVloJrkr/GBJ8lgckdPSnucDRoo 0tJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706864; x=1695311664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bTFKjAk668ydAQD60sA5QJG3NG/NYwbGYdSapTNnjEA=; b=M3Sud7fhb0J3jbyt6BCYT+Lw8N085Bg55VdIYGMxs5nF44SHxoqDRFxJMJlp3XJsop w7nkW1m1r/NdrU25T9cZIzOMpziRLuCgb22Ms+6CibKokwlRX2eFZAMobt8wUmEqrNGv KY7eqk6az6iRi3yupx9kaDITz2y7D0UZzR1gvZh+6jP2AhNBMcnSJtifQqv6nlcT8KnI b0mIdDdLioDeKHS2echkDmQ1/kXpRVZyG3YwhfZti7veC9xZx4ET1TuAcYz/omjSZLsb ig2GfjlA9UQ7nrwKxnC/mRr6Sc/r5YtOiwJBfwtUGUsDdHWOdlv1vPAKdM3uaVtEI0Dh b/8w== X-Gm-Message-State: AOJu0YyFwgpRTWVt77bfd/PZYueXle8Jgha3KDaToSANv8TR7P/m/IWu 5In8S9QyGnkzyK5JM6SV/nX/dw== X-Google-Smtp-Source: AGHT+IFFFMlMeQxCcmdUbpK2634GsVzA2Cyl7w45KNz/CuE+303OZcwX8257uSaBKfWl7FU5aFaUYg== X-Received: by 2002:a05:6000:4028:b0:31f:e5b8:4693 with SMTP id cp40-20020a056000402800b0031fe5b84693mr1803160wrb.25.1694706863676; Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e11-20020a056000120b00b003196b1bb528sm2116270wrx.64.2023.09.14.08.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9602B1FFBC; Thu, 14 Sep 2023 16:54:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster Subject: [PATCH 1/9] tests: update Debian images to Bookworm Date: Thu, 14 Sep 2023 16:54:14 +0100 Message-Id: <20230914155422.426639-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé --- .../dockerfiles/debian-amd64-cross.docker | 10 +++------- tests/docker/dockerfiles/debian-amd64.docker | 10 +++------- .../dockerfiles/debian-arm64-cross.docker | 10 +++------- .../dockerfiles/debian-armel-cross.docker | 10 +++------- .../dockerfiles/debian-armhf-cross.docker | 10 +++------- .../dockerfiles/debian-ppc64el-cross.docker | 10 +++------- .../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 +++++++++--------- 11 files changed, 33 insertions(+), 61 deletions(-) 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")) From patchwork Thu Sep 14 15:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ThZo090E; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rmhjv3m4rz1yhn for ; Fri, 15 Sep 2023 01:55:31 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogF-0002DB-MS; Thu, 14 Sep 2023 11:54:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofu-0001VQ-LT for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:39 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofl-00086q-W1 for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:37 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-31c8321c48fso1509775f8f.1 for ; Thu, 14 Sep 2023 08:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706863; x=1695311663; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IJP7tO/cH6sZ5F2skMW4pK7/7DONXwboi2ktB3ynH7Q=; b=ThZo090EiV6maDLc2hwFIOJMowiOJPOaBlWXd2Jxp0p9Ta5QoaSkCSoOhxh/f+1s5Y 0R5g/uCgJUqC/Nf8MA2Ci8wGcx4Hfx8QzXR32jVKsfuNkVK2A5bYQ75Q8Yp1RFjGoNX8 kimA4ZEpvKfWQpb3WItNrQrcGUL7CQ31XZZ621x9n0enpueisFhe84jE0WGgpjc8j+A4 7YRG5gqdJFL2F9ybs1gkfpJrNAFlsA5oVVjc+TESV2zaYtZdCwn6nI/iL8sBilK0rBBN F40h75+RPaPs0a1nA9lArufRA7w3A9HR8Mx+rXIf30LCAIJ1gieWu1CtTw0qbgXgQDyi hVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706863; x=1695311663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IJP7tO/cH6sZ5F2skMW4pK7/7DONXwboi2ktB3ynH7Q=; b=QkL30MeP/oBEb0JydfXjOrdq1RgPAfWTeg7qrce2SGw2cMAIMklZds9cx56xaTuheR KNTMGRtndLRpZYPkJNJMwAFWOB6IVWvwC+jgnAx4Ytpw/2QTX8TREz4GNH6LWg/kFHZm gTCTjnmEzFa936HSg/HxLz5dASp51zRyMMU+CYs3Ws0xZpb9f1f/O0NodhGE7nB2MV6k q3QevtHTTdDMyn+mxCIWaAD+qsdHhg6i5cOMGFdPJ6feJmOHDmLALpXwz0SlgpeUcePh y9c7w8M8SVF0BvUEh8s6SpCOAfmZWz9Yr0JJbRkzv/erXYUV15qDPTddJvB8LTqEdcj9 0vXw== X-Gm-Message-State: AOJu0YyRtPCNP0PcJUScKSxMKyZk1ht8bGe6sdXcFKyoSARKn5QiXNnS L+cDERH9OFkM+1egeSXLyX/11w== X-Google-Smtp-Source: AGHT+IF+s+XP/RnjBEInL5fWeolHHRVTqjno1BLasAMcfCm6NJfkbuOoqd/q4q3X33NqbHCSBOAZ/A== X-Received: by 2002:adf:fc51:0:b0:31f:829d:6b0c with SMTP id e17-20020adffc51000000b0031f829d6b0cmr1811771wrs.12.1694706863445; Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b17-20020a5d4d91000000b0031c855d52efsm2083942wru.87.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADFE71FFBD; Thu, 14 Sep 2023 16:54:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster Subject: [PATCH 2/9] gitlab: fix typo/spelling in comments Date: Thu, 14 Sep 2023 16:54:15 +0100 Message-Id: <20230914155422.426639-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From patchwork Thu Sep 14 15:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=qr/qoZaa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rmhjs3d7Vz1yhZ for ; Fri, 15 Sep 2023 01:55:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgofy-0001dH-Kz; Thu, 14 Sep 2023 11:54:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofu-0001VS-PV for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:39 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofn-00086x-Rr for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:38 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-31fa15f4cc6so1032198f8f.2 for ; Thu, 14 Sep 2023 08:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706864; x=1695311664; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k21Hb8AoJTRuQjBs5reis/Cuxx3HBqeBNhgdjuMaPj0=; b=qr/qoZaaD07wUY/M7Zid5aNXLmkibMIXs1hAkqeZ7rumx59db4YUOknDv034aqA4el P0TVOsZGrNBIwy1CWx/pKb7qAG1o385ErSvQXdsGecLNaKjy9eybLHiim6H7nHfrwOaO hlz8ZSR0OQw2j+xcN+tUu5kT+1yynu8G0Mv3QBxa2rcI/x3PBANeTXYS3VqtT2ZWuBih hpKSPM0WeF+/tEryGhOzvNG52kxjSKmVGx5wLG8OKG0BF79qFcC9IVy9rz1gW60u7Jwj Qc7OD57stJhtSncspMO57liav9WgHa9iCD3fvJDg2AJZbZAZAN7hEbpN24v0uOYQ6PFL kTAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706864; x=1695311664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k21Hb8AoJTRuQjBs5reis/Cuxx3HBqeBNhgdjuMaPj0=; b=Npois9cf8CuUJT2O//iv2ZZZKw8Axn6UdedDGsxQiWhPzWqypl52jF8DIylBcLE4Td s0ugHGK8bc1Z6lqeWA0HBUEaaxgRcy9YD1uE5XAjPquaPab9GAUVqThbJa53LNpyKKXI gbKJFEAKRAeI324ir/5MvHIAS3MNtHtx2HcsWvXPNHyX+is3HVOPDNnYzkG45G+bVp2+ Cmehk0qGOux23YG+WX9XxxRkF0mMCgN8+bS2PDeeEnjQ0DxaI61U/i4G62DhWEOeSdAV oDa0FlnfjtCY0kIUXJHSPIGz/MG5ms9dfu0D0eclyi3l55sPsznXeQLXppztuwOULnAG wUow== X-Gm-Message-State: AOJu0YyV6cZfY+0vRRiRvv2tDUptfv2seFY5OGqKLGEQaT9jkygf96LE NHbjRy/3q/VHQGPELqgfgXqeTw== X-Google-Smtp-Source: AGHT+IFTR0DduEb1HKr9P2zx0HxGoNIb7sgAfOtUu6Nt3aqVw7gzzcKJkQFwfJktJqz6vDBwObwrNw== X-Received: by 2002:a5d:4903:0:b0:319:6e3f:d5f0 with SMTP id x3-20020a5d4903000000b003196e3fd5f0mr5503850wrq.44.1694706863974; Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f21-20020a7bcd15000000b003fe24441e23sm2320842wmj.24.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C66921FFBE; Thu, 14 Sep 2023 16:54:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster Subject: [PATCH 3/9] tests/docker: Update docker-loongarch-cross toolchain Date: Thu, 14 Sep 2023 16:54:16 +0100 Message-Id: <20230914155422.426639-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Richard Henderson 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 Message-Id: <20230829220228.928506-2-richard.henderson@linaro.org> --- tests/docker/dockerfiles/debian-loongarch-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From patchwork Thu Sep 14 15:54:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CrN02Blq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RmhlY5SQnz1yhZ for ; Fri, 15 Sep 2023 01:56:57 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogG-0002Ds-PQ; Thu, 14 Sep 2023 11:55:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofw-0001Xd-JP for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:41 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofl-00087Z-Vd for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:38 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40475103519so5597325e9.0 for ; Thu, 14 Sep 2023 08:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706865; x=1695311665; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0F+tBp/Zccy2uJ7FpGjMy0R3Pa8Sdc/jZphp2CrwY2k=; b=CrN02Blq2X8Je6vjXY4CsC/0YKmG/IHWJ67JMUt//G5wMR5yE4EsF7yOHkKRHy9jL1 P8asV5T/ut3SlyEZkYwXS70vrXs9sueDOcc8cuWcVj/x1LAIMhwtJekMUaYFnu3q5CIf Rc2SOJR5WyydOsE5+2ZgjKrUSpfrhui9sA6mYh9WkEDw8lHVLdfXjqQochYHoCWWdXK/ xe6wfkuTTHu+K72IV1uvWX83wnj0b1YdU6evJUhzr7AYdDUQAvzBhYePYfzgbrfWBLd7 gD8RYZbE3DtAmYVFmpzXxZxPrtgA05joheUXC46W1AFwByeOHMvti6Rd0+/TYQgxO1FF 337g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706865; x=1695311665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0F+tBp/Zccy2uJ7FpGjMy0R3Pa8Sdc/jZphp2CrwY2k=; b=p01SoPDB7zSRIwnBoOFu23j3mWkcmwjR6OhifnR0b6PH2JIfJKpISp5wDSrnhqkqpk XiIQsZgSnauR0J38JPeBqBuHi/czVuVHEdeHh8ybtd38VSiO3Qj3fNsMoEPNl2J/69Eq hDwiCPJCIkkaRRfk1lZhPN4vb+zPFl4kelRrieN0VKpA0dkV1TMe3SRRJjvZeSI5ZCkT tDlvrZTJGP2MmYf7TBzYW6NGbMVFlf932XGtEW0Js4xMKLltstPx0hk3ZAlrNd1q5VXu aRtsTG1vy7eyMznAwc+vaMSEmTx6mmrl+QaDwQoPD8NY//ImN4QrA15XuJrwqWm7d5+d BmFQ== X-Gm-Message-State: AOJu0Yzy9FqXd8/PW2RPSGFgRpp7Vs98xXHL6IzVxDq/0XjMcmMgXek/ HdaI3cCIof/p6o0dAB5jyuDA0pLjPXHCBQzEJrY= X-Google-Smtp-Source: AGHT+IEbbka9N/h+hjyxJLQaCyCXqBrTDLLeu0GA+rnQ/79cJIBdJ6m0RjH4oY0ENjgcm8YWDNzc6Q== X-Received: by 2002:a7b:c01a:0:b0:402:f07c:4b48 with SMTP id c26-20020a7bc01a000000b00402f07c4b48mr4887453wmb.28.1694706865312; Thu, 14 Sep 2023 08:54:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g13-20020a7bc4cd000000b003fc02e8ea68sm5199620wmk.13.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DE6AF1FFBF; Thu, 14 Sep 2023 16:54:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 4/9] microbit: add missing qtest_quit() call Date: Thu, 14 Sep 2023 16:54:17 +0100 Message-Id: <20230914155422.426639-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Daniel P. Berrangé 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 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é" Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-Id: <20230912184130.3056054-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/qtest/microbit-test.c | 2 ++ 1 file changed, 2 insertions(+) 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) From patchwork Thu Sep 14 15:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Jk2Tne8B; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RmhlR1Gq8z1ypW for ; Fri, 15 Sep 2023 01:56:51 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogG-0002Dk-Id; Thu, 14 Sep 2023 11:55:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofw-0001XY-IO for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:40 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofn-00087l-SK for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401d80f4ef8so12536835e9.1 for ; Thu, 14 Sep 2023 08:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706866; x=1695311666; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HZcF5/gSkiSoxCO096FcHnSr7utgTrP+2NsmOiiXXQE=; b=Jk2Tne8B38sri77kpoUBAy54D+qM1MvfhPmzYGIrVqbAEgdDdW8E1sxUR8tywyNazh YTzTqIzUET7Zptnv6GJFLXVJNYjdfAZQ84okWmzQr/AGM1yTC/1tYwE6keetUavyOrbu Fqsyj/tkIuSUI3XhvyKIdEQOSUrZSh8iv8FEpyt6XZTIBfLyrqTXO6wGwkLkYZasHApY Ti0wmRIoTpqLUiL+VPYZsjdGL/JJ14iV6HtdNxKrc9ZhgtaKOpPZaAXpLwxMe28/uNTz BGE0j80MY8jJbLhYVKo2BIagER4ohw7wLF5MvLgYarfitgzR0S3mwtC76Nis1l6QUQ3o ryXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706866; x=1695311666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HZcF5/gSkiSoxCO096FcHnSr7utgTrP+2NsmOiiXXQE=; b=rDaddXZbzJHbkK0AuzyfoY6LzTSAb61rsbkolxwRkHZCprIyK7ndMhKxb+dtxHAFLw ObwjsJGwhuM9LrTy0HfPGxe0BCzEWsQv2ws91JUMB/HF59Mn+AAydMPLnKZvt4Vvpofn vYeXrbLXmTh/5Ddlxs1wUgEy3JCAaXcOgKAY+e5J+QXmhq8e4hpu5XEkBbstYA8bo60s QEVyalKMkAGyBpSVRc7EUV/NcFfTKdidAHFcJwSGWg0zorSTceGES4G3YIshw1X+ndcB hF4BwHCPv+pv/VQccjp4f9LMhWzROc+roR/gDlluZ85IPE3YRfo1Yxjc2Y97b3IklKz7 13Vw== X-Gm-Message-State: AOJu0YwkOhUW8pxWhTrLRUL+H8ei8eotB/OiE/Aa0qa1UxJM9Ja3MjDV 7SeaOVrVv4x8ywEvVIoL10MBEg== X-Google-Smtp-Source: AGHT+IG/tWW5Z2q7tX1z8PC6AZIIPCnI37Nw9aQAgY35Pug38fIRKdo9NA7kJ9g/TC0ogzHdJlsczw== X-Received: by 2002:a5d:5148:0:b0:31f:a682:d27f with SMTP id u8-20020a5d5148000000b0031fa682d27fmr5416472wrt.67.1694706866513; Thu, 14 Sep 2023 08:54:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a4-20020a5d4d44000000b00317e77106dbsm2075765wru.48.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 02D6A1FFC0; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Date: Thu, 14 Sep 2023 16:54:18 +0100 Message-Id: <20230914155422.426639-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Daniel P. Berrangé 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é" Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-Id: <20230912184130.3056054-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/qtest/libqtest.c | 7 +++++++ 1 file changed, 7 insertions(+) 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 #endif /* __linux__ */ +#ifdef __FreeBSD__ +#include +#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); } From patchwork Thu Sep 14 15:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=zECJimsK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rmhjs3vn4z1yhn for ; Fri, 15 Sep 2023 01:55:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgog2-0001pp-2F; Thu, 14 Sep 2023 11:54:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofq-0001Uz-Kl for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:37 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofl-000880-VH for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:34 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3ff7d73a6feso12566585e9.1 for ; Thu, 14 Sep 2023 08:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706867; x=1695311667; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ra9feMe5mpTaaSeuQ9CkHp2J2B9ZX509sNZE9U1IO4U=; b=zECJimsKG9YKKF1SMlHRbrin2hPMqtmEcoK/V7Nq+q3U7ZZ2nmBn9ScN29BPjd7O0K 0/OokFAWgkJd7NBOeOGQBUoC4Xv5BbPaJErAlvSm/yEn/iTQrlGs8dwfTpF/1TyVZJ6E yo27jHfFJLCIFx0IXJAT8EIDYP+Ll4q78kfVy/45PpdT7IpS+ulp4SRwMMiOHSrf9Bmw O/Zj1TSxDWmcQ/fUGCNzrO9kkvmphZtk8tpgLETk02hD56kD8WZ5QY5B+EQK2HHT+To2 pmc3Rqo1L0Pr0+hzwyO2nrqYE781a1UUyy7Z6kHOsfbSQI39XIn5MW24aXnAc+TS0N8t WYUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706867; x=1695311667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ra9feMe5mpTaaSeuQ9CkHp2J2B9ZX509sNZE9U1IO4U=; b=f/jKzqD9PbRCZdHMlbjUE6idv3qtTqKnYWrqrjyOOIAA45cppwkmgPSipZYSe7kjB0 aJ3t3ESwYfNPpbF9CsN2asIeoTL9Vero4rFoF/L6vWt7X0C/xiujWxX5jUpBKnbE1MQG cquplTjz8kchth1V3GFNzH0VFpvkkAL5gIBBfGiYWak6HXoCpz+0J3fbXNoHG2v/a4cT JAVY/SEbyU5FpuH5YqV6PtCvIirOa4aDOs3ZEeGFaWksgDOmB9wArZNXly22rGC2DwAi iTlRhC46BTIc1Y5UCoO5CIlx6vZZBPhl8HdiB4HX/+AYWptaIsjAnDxE3fd60yamPB4l CgVQ== X-Gm-Message-State: AOJu0YwwfcRxarf9wlXLmi6RqvySN1dk7tbtrvUFl2CrlBqQ+UOMz1bk clhGQ6Oji7fvhOtm8seUmwCOuw== X-Google-Smtp-Source: AGHT+IGVzc8qMdBfm9gV0Wg5WFAJuJJ6GSHzrZx7LYXbH3BEVUMq5WdLJvveBVE0tMNpQbmb5yS8Qg== X-Received: by 2002:a7b:c44b:0:b0:3f7:f2d0:b904 with SMTP id l11-20020a7bc44b000000b003f7f2d0b904mr4787828wmi.8.1694706866826; Thu, 14 Sep 2023 08:54:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f20-20020a7bcd14000000b003fe2b6d64c8sm5144804wmj.21.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DCB11FFC1; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 6/9] gitlab: make Cirrus CI timeout explicit Date: Thu, 14 Sep 2023 16:54:19 +0100 Message-Id: <20230914155422.426639-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Daniel P. Berrangé 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é" Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-Id: <20230912184130.3056054-4-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus.yml | 3 +++ .gitlab-ci.d/cirrus/build.yml | 2 ++ 2 files changed, 5 insertions(+) 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@ From patchwork Thu Sep 14 15:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=grxQCo/k; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rmhjs427yz26jQ for ; Fri, 15 Sep 2023 01:55:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogH-0002G3-Bs; Thu, 14 Sep 2023 11:55:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofw-0001XZ-J1 for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:41 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofn-00088G-Rw for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-403004a96a4so12347275e9.3 for ; Thu, 14 Sep 2023 08:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706867; x=1695311667; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ar/Na+5UA9tN2heidPJESlS3zwJBlN8svfE9CzG3edA=; b=grxQCo/kEbmBb2ICFf6himleEERQgukNB2NFqj8sqrbW/MSkZpGJW46umGXNeUdHBy 9KAMvcQenUJL0VibZT28+NJYym/RmFkikFt033IFy+mlC7kgXGq4mcFfNZZ2asiw9lDV i1JoKNKhkWaqCbSTe4bwXTIC/uuR8jCU5qNGaGzjyTckFCNuU1CKppLDhkgPA2ftwNRX UsqjcRwE/bqZH+Ay+/CAwUvYipK+jn4kJynTEvBY6hnttYGnHJDO1wTXRFtwHJhIYpsh gCc+nZ0ewOtKyYGzx68oSyWu/3ynmA5Q6TWXVHy7Xw051/PtmMfCOPcDiQQpZJrLQpVI w/Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706867; x=1695311667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ar/Na+5UA9tN2heidPJESlS3zwJBlN8svfE9CzG3edA=; b=MjCO0gKG2f7XxU9mmC1mbvK+jmnVhFPkreT1a83Izvg/dA2cArMEACBzPTy3hnKWCV N91iYtMtJ4yXIOWdjhZ0haOI7Zt7cFov59NzTBp9VkvZN8hdxOWPaSpFymV6i1rbNS87 YmjuaGGTbdPrt1FPVUO0vBkKBSRJW65xTCPQePqFyNbpOyAl3KzdreLm9ulz2lK6ilBh rSH5mNxozAAHrv+atj9ODXJ4eetIKqDTxQo76uoK27+L6LaCu0O4zTGV3UPHX+qWiP9b DTCIRO4QOEXTQYYZReBbMURSWAbFTsXNsZarz4w45b38kxSP9wJ6cXktYu/VEA/mRMjc 98NQ== X-Gm-Message-State: AOJu0Yz8NdYCxshY0BJO20jggvqnzv+0lCZYjfgIK2Z89JDVCoxCTWF4 +dNhkM4uZ61PtSD+Y96hTyQIrw== X-Google-Smtp-Source: AGHT+IE+xPbO7ZdSSK1P8Xqc7zL1S0cRKyTJdvsfVa+0sVGguWG01Kg07e+O1eZr0oQDOSu2duguBw== X-Received: by 2002:a7b:c846:0:b0:3fc:3e1:7105 with SMTP id c6-20020a7bc846000000b003fc03e17105mr4926867wml.24.1694706867558; Thu, 14 Sep 2023 08:54:27 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c00d100b003fe0a0e03fcsm5180621wmm.12.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 355A61FFC2; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 7/9] gitlab: make Cirrus CI jobs gating Date: Thu, 14 Sep 2023 16:54:20 +0100 Message-Id: <20230914155422.426639-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Daniel P. Berrangé 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é" Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-Id: <20230912184130.3056054-5-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/cirrus.yml | 1 - 1 file changed, 1 deletion(-) 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" From patchwork Thu Sep 14 15:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=jCzCbeZt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rmhjs3w3qz1ypW for ; Fri, 15 Sep 2023 01:55:28 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgofz-0001hn-Bd; Thu, 14 Sep 2023 11:54:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgoft-0001VA-A6 for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:39 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofl-00088P-VH for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:36 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-402d499580dso11976005e9.1 for ; Thu, 14 Sep 2023 08:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706868; x=1695311668; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aq8NmlF/vcFodf5p9FXdk6/zlLfm5raaYFWHiGtXyA8=; b=jCzCbeZtub8O++9prSZ3QgpCZ/PF/ajpHTGmuuKIR959ZzDGngVy3aQLyYRuED8Y0X p910tFDcQm0b2yfIVNfKo2jj+bm/Y7fz/C5WnBtKnoVIZDqxreMPqLfAzzceZC7PY4uf 1fyAXAFtWcyY2oOpWTQRk83ueP662Ah0DZo0p6ClfdRmaLZQh5GDxBfFkRT8ZxO2i4tS LNJd41BLEToIf7/f+jB28yecxH23gGNlA/W03ObF8o9dMocBve4YiEgyX2bYFApqdEli xNwAe7qwRU/CgrvYX3eqQKIrb+R8WZFjkzMFor/ItlElnbRGv3crwsrtItzUXN1ZmMq3 FPlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706868; x=1695311668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aq8NmlF/vcFodf5p9FXdk6/zlLfm5raaYFWHiGtXyA8=; b=mK2PDYhkbxsmdE0pm1IpsEqdSxGpkjyq2XsCsB43JHW9exBUW7WLsu1MHNNAUpJjeF Gjx4eBnnjz5lbH3EmaDHX1A4Pj2/QJv54V0mdmq6688oY6/jjhkVTWPWkT9gWbwghy9l A/Jfddee7r8aoa7Q0MbIqBpo9p0LrZ+FzjDhFrplJTxm4M0UIXwbCe4/+sVJuvLp0t8d dc7BJDHFHk2UW5pUkZkw5zBRGEbac7C2GlA6vj2CevJhyIyqabo7NRKawSTEItckv6Ug Rfd5Z9vivmiy/Uz4aPePMMrWNe5dQYfE8bBDmuB6W63j/BPSSqwv2CWWnQ01s+YrVb1j RDpQ== X-Gm-Message-State: AOJu0YxRxmcQQ2HRyaAq6lHrO/9HuJREUy7t/LXe6PM9YzB3CY4o8Ybz VELkfKPirp8+/ZTPEdtwfe0UIw== X-Google-Smtp-Source: AGHT+IEYSX/Ft/B0fQUXPozpfU4/99hj5m7eMOiwCkpTA8cQHn/mnVfi3Il/+7U3W8VvO4egSVyhkw== X-Received: by 2002:a05:600c:210f:b0:403:be16:baa with SMTP id u15-20020a05600c210f00b00403be160baamr4972026wml.29.1694706867810; Thu, 14 Sep 2023 08:54:27 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s23-20020a7bc397000000b00403bbe69629sm2299139wmj.31.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4F3A11FFC3; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Nicholas Piggin Subject: [PATCH 8/9] tests/avocado: Fix console data loss Date: Thu, 14 Sep 2023 16:54:21 +0100 Message-Id: <20230914155422.426639-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Nicholas Piggin 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 Reviewed-by: "Daniel P. Berrangé" Message-Id: <20230912131340.405619-1-npiggin@gmail.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: John Snow --- python/qemu/machine/machine.py | 19 +++++++++++++++++++ tests/avocado/avocado_qemu/__init__.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) 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: From patchwork Thu Sep 14 15:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1834310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=SH7fXgKy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RmhlP1XNyz1yhn for ; Fri, 15 Sep 2023 01:56:49 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogG-0002DR-5f; Thu, 14 Sep 2023 11:55:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgofw-0001Xk-Ki for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:41 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofn-00088d-SB for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:40 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-401b5516104so11914095e9.2 for ; Thu, 14 Sep 2023 08:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706868; x=1695311668; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AWyWexWkL9ehHlLTXF4LI+FOAnsZypSIrQiBOsr8h/U=; b=SH7fXgKyT31E+0Q2zuqubjaLC01a8vnyRv6GwCiD3ULNI5ANPsscx3Bbo/iqpGcw51 qPwR0CFhF0WLjOnjnYotK9IsPHLJETxx0+yJvm0g/mvHEnng6Zqe7Jcm7vXBghlY2CvQ dPVjLZwhmY+9XOd1Tp0E85xR6WIdVYGiV6y0pN7Gg1MGfbTp9ZAGxXSdaMnV+zoYqyui k86/0Yw68vdJPQOlrNVTbYNL2rUtSfCdn/TWyvYKVnyF+pfqa+Ws7Da+eW3Lmtg1n+lt SJJ60g8Q6b/wolh8M9Om39MwYlCKuorHl0Zvx9pgmDdCS8K9zmrltLLBfBf+9aaICF4h oIdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706868; x=1695311668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AWyWexWkL9ehHlLTXF4LI+FOAnsZypSIrQiBOsr8h/U=; b=bhj8LLzw2vLk9LWRA8502HD8OQN/diAg1tSv8Qv7ZXTJt1GBkhy8/9DXI2qch9BmDX QEwJ/4+gzBJB+me1/lgYzwfPGM+sqzLP1omkvPeCfEMdWyIBsNcOkDIV15ZF9m5Kml7J +1rVqvMYn8OprXp2HimgX0ECnI/E62iqE4isX2ifYEgnJ9jRcVdIFm26/mwc8xZYcCSs Ntrcg3Qmrnp0pruVH4zBiMjg9aMOSrv9lED3Yu6BSUMVR+YPLBpHeuxkfwORaWILyN9t vuzjEBzB5hDe1oG3A8NwrcAtKiAJOb8QsvhNso9Lw8q61JgbBpATQd5E7YCvoXgPveH5 wcAQ== X-Gm-Message-State: AOJu0Yz6+W/ehf9219qe2MY2qtFoNWXfOU59Ldgab8XmgC7so1eDD5mr MRkQ3CmWkw7USFBtAykHigcGGQ== X-Google-Smtp-Source: AGHT+IFf4fI6Ty48UFsJkIDinQNl2hKC2bBGPwIfPRRqYdrTwz+cGC6m8VsIsVmN+mIPbjDphOr2rQ== X-Received: by 2002:a7b:c012:0:b0:3fe:dcd0:2e10 with SMTP id c18-20020a7bc012000000b003fedcd02e10mr4562816wmb.17.1694706868544; Thu, 14 Sep 2023 08:54:28 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 18-20020a05600c235200b003fe61c33df5sm5228397wmq.3.2023.09.14.08.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6FE691FFBB; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster Subject: [PATCH 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 Date: Thu, 14 Sep 2023 16:54:22 +0100 Message-Id: <20230914155422.426639-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Philippe Mathieu-Daudé 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 Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230913135339.9128-1-philmd@linaro.org> Signed-off-by: Alex Bennée --- 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 ++++ 4 files changed, 24 insertions(+) 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