From patchwork Fri Sep 15 15:08:41 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: 723116 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp435376wro; Fri, 15 Sep 2023 08:09:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAgNtuJU0VPS3oMfFreyeEaZUH0Zq/w8mBl3+alt6L2YwoTZq2ltPJq52JB65VyfGJTKbp X-Received: by 2002:a05:620a:4016:b0:768:43df:529e with SMTP id h22-20020a05620a401600b0076843df529emr2077322qko.58.1694790594110; Fri, 15 Sep 2023 08:09:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790594; cv=none; d=google.com; s=arc-20160816; b=Q+WXBTvJjPnj7xYaYMMRpwFD4G/A8htncH+Hl0fMl6z/f2iL37sSJfVNxIBsYRjcJK PztS1LOqRLIkBZ19+akig0mRNV0osxTvWODu4RIhi8xFsW2Gr6ZLUURDNC4z4tHNiBgt 1ObTMjgL+M/298e1gPc2hpz48yj6/osXX8GsCtmuQbL9VvfvuJFzX8m1/eQUOeMYeDNy FIrqcY7Z9jjHbw7R/xzVMoyJ0BIa5S88hpFqKwefsVTMVM6f+WCBz99dOHqiJc0GOYgd ANYGZdk1d8gF6wnKiW0iqq4v3a7b2vY5X41YafkE/G8oJIzenb/vwSabT60VFEXSKDho SLrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3U6CnUO4H14TWX5ohGrwMIlPaGspMb8A4A9i0+k5wOY=; fh=MB7eYd7rnLrXI3nJ9rdxTzQtDWXNOvVrI/pGOS81ev0=; b=aR8YZfvhy7upb+z1nRt0f444ROyhdRlqemyO9O1+3BFCWQ0gwJ/sbYcsgLaBfZ+MQ9 g/rskCHspbxIEDgmnwE06v5tDUqdKrLFNVbtGnt0yISOzHeVfjEo4YBlaIhrXXo3YGbI 5q4nZXF+jqJbnAS9orMZXNcT7Xb9oSb/7NsVrayiu3hJmpc+da2HDO97UwCM00zCTLwu NLbnGVdY+2Mpv5dAn57w0L8lCKDAuZjUsmStWLxwXNZ/Em4Vw8lt/aWFz8m2UQfmjj3Y VBWxO5bxz2b9quubF/jsmv2w7dnMUGvXHbt/ZdXlrWh+Wuo2ZYsN66qJfB2VrP4D9R7f Ly2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I1IkS+K6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l11-20020a05622a050b00b0041208cd2e57si2448456qtx.771.2023.09.15.08.09.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:09:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I1IkS+K6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARc-0003Vw-Vt; Fri, 15 Sep 2023 11:09:21 -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 1qhARF-0003Bi-NG for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:57 -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 1qhARB-00028m-Ib for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:57 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-31aeef88a55so1966174f8f.2 for ; Fri, 15 Sep 2023 08:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790531; x=1695395331; 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=3U6CnUO4H14TWX5ohGrwMIlPaGspMb8A4A9i0+k5wOY=; b=I1IkS+K6jnCb2pJ+v0NbsftTKWD+4d0ZV91LgFXw1kVF4PlXf4iOGhwgmOiaQHJ5zI FmxXUdFunSFEY19u1e4ojemBcm9/13lQar2lGDCjTAdfkTdRHILUUa0XLNMBA0lOEZWF zyCEwUNStTTbn0xbK7U5i7Iysyv5M0K4hxn84QAhW5YAKPSRdxjk+Vxs2k/+j2fdsGt5 RD725QS7CAYKnG88hB3bWwMZVEcOKrKxdnpGhQTbIes66cmJzbUCEaQpCxWt+3ZrDUUU 2sbtVaRfUYvVvpXz6P9Ubk7VPZoiavNoMc0/wYfZcYM3zES1VuIQJLd+vf1nMH1bEK7F aaYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790531; x=1695395331; 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=3U6CnUO4H14TWX5ohGrwMIlPaGspMb8A4A9i0+k5wOY=; b=OIORixz1kuflHQ2GTUbYx/mPqil/amWC/LhqRAimFGf/omEfhWsSBFeXzJS4GVUqea gmVu/TK87LfFs0mJsoYCdjb1HNmBchHFNDnBI/1BaOv1FzTXz02zu2klg7/RQ8NWZqq5 4nE1EI8VVIdavBJnrLsxsd65wqPHB7oxoeDI1tX9ANZ7kJKZ6Pb0dE+QzwpWFjtD9GYM 8Z3b/Q0/wd6+ItwSx4o9FbHI5S86O7/tfcajlSs+Lby51tm0fPVnjcfkPtLwG4bDdJuE TpC2TAUXDbSTV7/c/UsNq+xsdATgIzkC4I21Vi6jfzKmZ05K2G5ZNfvXkP0WSAdtWbZN DxOg== X-Gm-Message-State: AOJu0YyQFdiQ2JQRuLT4IQwE0ppl7q2PL8/MGUL+tOtzMrN7eb8BSTLr QM3cNONKnt98R2hr8ZFZkIErgA== X-Received: by 2002:a5d:5011:0:b0:313:f399:6cea with SMTP id e17-20020a5d5011000000b00313f3996ceamr1813982wrt.4.1694790531231; Fri, 15 Sep 2023 08:08:51 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o6-20020adfeac6000000b0031c6dc684f8sm4648409wrn.20.2023.09.15.08.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 196991FFBC; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 1/9] tests: update Debian images to Bookworm Date: Fri, 15 Sep 2023 16:08:41 +0100 Message-Id: <20230915150849.595896-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée 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")) From patchwork Fri Sep 15 15:08:42 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: 723114 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp435269wro; Fri, 15 Sep 2023 08:09:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHF0MdzzKpozFvZCwio1aNm9t3DhrKzu/8B7+pFWZokoYpAhlexUu92J6LiS8hQjZAqDzlG X-Received: by 2002:a05:620a:471e:b0:772:4a91:c41e with SMTP id bs30-20020a05620a471e00b007724a91c41emr2018040qkb.20.1694790585318; Fri, 15 Sep 2023 08:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790585; cv=none; d=google.com; s=arc-20160816; b=ppRbb/eidmlo5oHtRlmh5EqKwwkxLY/JBx4fGh7o/hfXHTqJFrd74HI3UAN3wrZeys 75mMfZfHenRcJ/j8xWOL+GUu8TM/P++6hcT2TFnWVYFAh2aedHE6NCoiGTnxYQMQiacq iI2xGZ/lHKSIsJ/hkVpb/CYsNmZpmpzKmp5Tu025q6xIzbFKAkd9iKVY4L0anUEgiSd4 5C4W0NXIZyRcLL0xDdChYLkBdyyjQD5iRtGZV/wdjH75caPxS5XaBuqHuiNGk0kEQGn3 iPO53J2s4STuRSRBddMXq1SCoyH0TeOzU034tTtq9PQPqzn/Ti4ShNmRmndO+d86P66F RpMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ll2JCdzZBjak8Fv1H6Rw4JPUKwWAK7rZwdDw2TTprnw=; fh=MB7eYd7rnLrXI3nJ9rdxTzQtDWXNOvVrI/pGOS81ev0=; b=ehjDW/K3gY9Jt7vvNolu5h+XiwQI8xMsseXZrnJH9AWUhcZ2QweT+64ZH4e5GcdYAW e1NLnza00I8CPW/yNEt++U4m+WQhTxLkCH+eJG2+0xVyHRIpjWG/4EkLKRsq2qJs8zB+ tnTQOSTcoHFo/n3PeRoVkbnqxM3L6IEDBYuPc8K2o2REWp9pLd8Lw/QzIg7CGLF0lgM6 A5vLPEpzmJUDW+yEU+vlb6egnssOTq8LrmZ/1jPwRvJHRy1dza60AemQzpcqbAnk1fGg JdqpJgaVpChQWUMcWJ9xffoxS3j0NU8TLFU+4NTHwk7E3ts3lRolLeQNXJw0f5J251q+ xCSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W1SMzq+S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s14-20020a05620a254e00b00772553da474si2499945qko.720.2023.09.15.08.09.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:09:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W1SMzq+S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARG-0003EU-VU; Fri, 15 Sep 2023 11:08: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 1qhARE-0003BE-T5 for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:56 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARC-000292-AG for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:56 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40472c3faadso20003475e9.2 for ; Fri, 15 Sep 2023 08:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790532; x=1695395332; 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=ll2JCdzZBjak8Fv1H6Rw4JPUKwWAK7rZwdDw2TTprnw=; b=W1SMzq+SYBkvTQftcuHLUKoJDAbkdHNPUyy9R9fskUTlX0+lYbwBg0NFd3FP4/3ruD mMDq3QiJldne2NjSfczBmmyBydq8xjNA3nJT4CU0KuZo6DKula4kFnjFBueFa4UsJpZa klFBdXLSoQ/ZSWN+eMphGfrDBQbFzN8Wecra2Z57KnQCXZje24MsyNPRd2YOrIfXE0zA 4mb6sEAjaBc/WLhda6L0TRvkwoq2VHSASLs6qG6K/JvXRZGl0rP3WgVghDMTnn7TvRHY DM5VcUZNW+CG+szP1prW9a1MTToHcjawMHfUg1hxyDktFBC7AiQLyMN47dg9utzDIviV Eebw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790532; x=1695395332; 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=ll2JCdzZBjak8Fv1H6Rw4JPUKwWAK7rZwdDw2TTprnw=; b=Jin4s63REff9xL43/NGBGbhU0d0eRfzZCkFWzjAinhJtmKrUGNNrNLm9z1GlXv96Fw eVFz+QVDohBTTU67Miaqz5OuXhTvJ8EatVJUUDfoL9wbXb+CZrkDGoHWjWMgG+dFlC6o IfS6QEKHbzgRYw7glyEYuqXjjKlOQaAaIpXbcELo983zb6KO00j/1q/FnEmbt7fdTA4s F5hUYGnXR0sweO0KZ2HYLnap/zAJR1Pf9Iyje17lwfXCcsCFFvqHkH4JlbUAg+g1QJQH 6dcQgluQoycuGCzvJ/smhHqQa716mAifXV3cQeXAoJKPXhTTSyNW33VR+YrGuNosdEKl JVmg== X-Gm-Message-State: AOJu0Yy+ZQ1DIA/kZ29ygn9gDxuuQMVTV9DTkZozBOLbXeGYZ+MJ3kR/ zBgdI9miTOp7KqmEprFlLSWGyw== X-Received: by 2002:a5d:5502:0:b0:313:eaf5:515 with SMTP id b2-20020a5d5502000000b00313eaf50515mr1536867wrv.6.1694790532698; Fri, 15 Sep 2023 08:08:52 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n7-20020a5d6b87000000b0031ae8d86af4sm4634863wrx.103.2023.09.15.08.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 314A21FFBD; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 2/9] gitlab: fix typo/spelling in comments Date: Fri, 15 Sep 2023 16:08:42 +0100 Message-Id: <20230915150849.595896-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée 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 From patchwork Fri Sep 15 15:08:43 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: 723112 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp435106wro; Fri, 15 Sep 2023 08:09:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHth1N+1v9IXGxUIjhB1LeO4QzDPj1wYPDoCqvPzojM/PF4aHImt8RBi0pjCfcZ1LLIi67J X-Received: by 2002:a0c:fa08:0:b0:641:8df1:79e3 with SMTP id q8-20020a0cfa08000000b006418df179e3mr2325087qvn.29.1694790572234; Fri, 15 Sep 2023 08:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790572; cv=none; d=google.com; s=arc-20160816; b=WV9unwKbI+w75JjaAN0pvtW3YjKlZhxrZ1oBGlntmJINCNxUuzcSvytDamAw8ltpqS HexL/oOcr8vk49L15BCwxZI+LYfUPQ8sKZLBWV9squmzBKIQD65zW1zRLEK+hpdDEf6W Fun9Jx8CMR3XdXFphU9tC5PUSWuACZ8kJ+y0KTOzp52bZtEV27e3qlYmVJ5eTLKAPkP7 H4Y2id2JUw3czkBF4a2LtTICXD/PuVWxpMF5CiUbsJJ0P9fzme4jjiYInAZwh7lb/wWx OV66mcMFmVRJsY2yvzkxPTz+jqhPV1w5Vn8qri9Z6jkmAWm97xBVBq/1zcBEC7Lw/Haw UlzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mMQxsOgidH8JNyNS7YPwfWsbNLccXwZv2/CWQGcUMy8=; fh=dJyZD73VKi6wVxB+nTESiGQhlbydl0DV1Pufll/LhyA=; b=tTZMAerf2evDT+8HBzWZEt5hO1Qjjktf3RFr6vXGX9dSlKVxwVAaLm8blcOS4xEySd XP6leBBiuVIDjUVGWmd5JzVFjkRdkvgwRl5QRdygDr08Y6iZls0JC6qWSxldSPjMN6SH TrhKrH8w5EvkTIofp8cj6v469Qsth9jx3JSgOUvJNWb5OUvEwbl+RMKtD2bf1+JOjVxT pfQPC6w7nP78WCL0q0p6u9MCdRKm2AxBEXBWFC7piBim8f71NZXstve+lgAdkleNkDYe t4grT7HIzECBqahgf9A+YrhQpq1XymRoP1dFVTJMEMMXmqk6/jnpDtSvThMy5aMrufhR EtpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W644bBiz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f3-20020a0cf3c3000000b00655d8f0f932si2412463qvm.357.2023.09.15.08.09.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:09:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W644bBiz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARM-0003HR-Ac; Fri, 15 Sep 2023 11:09:04 -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 1qhARE-0003BG-Vg for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARA-00028l-Rr for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:56 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-402c46c49f4so24495645e9.1 for ; Fri, 15 Sep 2023 08:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790531; x=1695395331; 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=mMQxsOgidH8JNyNS7YPwfWsbNLccXwZv2/CWQGcUMy8=; b=W644bBizRMluPyKZRu/chDhan7+dqmqoqkM+ZB1kh/NhYVTDeONnC/9kMekabPOuGu Bhhf5nYHtcOSC9bFm/65Jr6c0mU38Qo5BJ+DGY7Hb7P3ub/8WgGARfZzlwqeWgeG3XH9 4dhRfnjRTgeB/DWoojkMa0kFkawhoopBJglbftMaLwwsYos/8NQihsqJvW07TjDWG6jF Mc6BGS+x3+ALsmEEF2V3a2jeTXoCrS0KxBZ9wkSI/tSXJw3DIPumkDll24SQt0ogP/Ms 2hiUZFWqx7tkNsoElZ+4t//cmsi6p+sWi6PJtcyLuKf+Qv3OAgbCDxwjFJCWty4LBCUw 2x7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790531; x=1695395331; 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=mMQxsOgidH8JNyNS7YPwfWsbNLccXwZv2/CWQGcUMy8=; b=LkeOPD1R4M4BA7uZjPYrVJdRL0UBx8fQa2xAA4npaQo0h5WFhFQ1tvIopskkQQhib2 YHB1AMrHKoYlbZLh1QxZu4RerQN5EXZ5l+rwUOTHASGy1ZqaNS9ZrOIm7L29+ycZL2j0 NU8fKt4O9wsnfhRfaovPfT3XeXjQaqYC+GnyaaReJlEB3PiY046i9A7bCS/MFzXWJWgJ 0b0yglZQP7Plwad75My87O8f1+YqncUcmbfr8mnsxOBHJVcCO0dxJ3AQeCV+CIsxTgR/ NhRfIhj8qjmHEA6rNPOTEpAP9vRwAvF75NKpAAKlnHzu7F2JfRaQcLZYj4hV3ZdQj/8w ceSg== X-Gm-Message-State: AOJu0YxYmLSAXSFiocSEYDS9aTMOwGV13m5GimMAMv02HjSuXbgbzO6k WJp/R4x8wbVo6LKUFGa3ufVCTg== X-Received: by 2002:a05:600c:378f:b0:401:d258:ad26 with SMTP id o15-20020a05600c378f00b00401d258ad26mr1706401wmr.19.1694790530952; Fri, 15 Sep 2023 08:08:50 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u5-20020a7bc045000000b00402be2666bcsm7728075wmc.6.2023.09.15.08.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 48F3D1FFBE; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Song Gao , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 3/9] tests/docker: Update docker-loongarch-cross toolchain Date: Fri, 15 Sep 2023 16:08:43 +0100 Message-Id: <20230915150849.595896-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Song Gao Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée 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 From patchwork Fri Sep 15 15:08:44 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: 723121 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436480wro; Fri, 15 Sep 2023 08:11:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkk7N1aQaABPxfDDKX5p1RzZMBgk/2qpKWVWfGj28P+SJRsUowHi5RxbBfP+P0NMsImiFD X-Received: by 2002:a05:620a:28c1:b0:773:a770:bd9d with SMTP id l1-20020a05620a28c100b00773a770bd9dmr1942726qkp.16.1694790699160; Fri, 15 Sep 2023 08:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790699; cv=none; d=google.com; s=arc-20160816; b=H9n+huELkINIX71p7arJSj+3c54MubfO/hKGQGBMCeomwBjGVhtpL1QyMKlNBXOujM irQv+jLAYkHPGCw/yuqJBf/xuAXYifMJRI8jjso8XK45xbnAGFjKTvuFT1Y8l9X85i2/ UB+anHe4Z+jnXbzU984WDEnS2ubHJPPI+orocmYrlFsJay2M6QKdRylXUUAnCaqiD2dh X8bx1qJz95foKEa/VffNXsyb1t+nEOCUOf7oliiO3P5/sTiqnl8/jetI3L9pFaVfDtnD wGk8XDrw8BNTJ6JERbi9bV/V2X1D8IrW2/Kt2R79sprrgKiEJ7GRgqbihy4swpQJzX4W Tlfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q10Bjf5twhWJo+XU63cogYzeT8gsJVx5jFBjBqDS8Tg=; fh=Lb20ZOWMOz1ozKWJ58VyylpPLm/WQ8gBMJGYYWec1So=; b=te/HoFodGZC0cDWIIdlNM7u8CxQYDnw3FYBKOWVJH2L6XyI7LVD0DnMUhFyMGu4Qkl gEjOLWz9pWROGAyVvK5Ef0K1n+uTpBg2jOcqxL1GwAS24zEekTMdLNuXBqmcOCkL1dGR ZMS2H+I5jmFSNofeQC/QCxD6MMOMkdFbb3IVFXZ0AW6iuT/Ev8tKsKcw7LVJ39uNxl0Z ZrPBrtOpV3JWHBSOUt7EflP0o+zD/J++Mbkh4Jlk1HGt7xKAzjjkV5d/q7VugMlC8Lvi 5HDwx+3XZgOq/Pv/NbSvnUT8aD9wFldfK3KzdkN+q2PWkmds57cVECgOdwes8It0n3XZ hYAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gJdn8rWI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t25-20020a05620a0b1900b0077263b2be76si2415141qkg.362.2023.09.15.08.11.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:11:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gJdn8rWI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARU-0003MY-9P; Fri, 15 Sep 2023 11:09:12 -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 1qhARG-0003C5-5h for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:58 -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 1qhARD-000298-14 for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-404c023ef5eso2658775e9.2 for ; Fri, 15 Sep 2023 08:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790533; x=1695395333; 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=q10Bjf5twhWJo+XU63cogYzeT8gsJVx5jFBjBqDS8Tg=; b=gJdn8rWIsk+flH72+FR1NVOK7DrEwHP2D6SwsCHV4W0M/RiNS1ZUqmt3UNo3zg3tkc ZfC7/hXXi+8L/ZCdw4T/6oox9Map0gwgaVK1cj9Wvfq04mLKw8jIX7tZkENtotfBsUM+ l0dCU0YCdaYLMhPMweBJWuAjP1+6BgQQIe+AXSrJWdltrVfwf4FpYWJ2/MKQSYCeKZJb +F3s9qlv/dELmbE9Oibp2ZjaaCfbflghipsgL/aQWoFfw81pd0PGOqY5VhhNpniDmO1E BKYGiRM/F/vPxXSXFjrNrnSQxiuHARzsCymoya13QMRgfP07OEs3+3M2aIw4pud6hlqh ZJWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790533; x=1695395333; 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=q10Bjf5twhWJo+XU63cogYzeT8gsJVx5jFBjBqDS8Tg=; b=wwhYlo8SBNerhnstl8vh6P/Y8MLMUx5A1qOVA6wGfAvENvKFPvjzm789U6oqJh8jI/ 9uHrgybQdhu12CacaMIc2p9DvxCfdxOb/jVLjF19ehnEfeOrSQtJCMElx8pJkEZcPByp pGnJORG098brd6XX6PF20bZJhplYEMM3pxIV0h29aByhKaXl34NeDWgLME0Ci1cJGFKy B+2RN0rVW2suDA2WuhFHPyhOxIrmwUmmW0qpHQine8MwL5JWX24tScgZBnTshtt9ncGy nWjAwjETwnM3/HAUH2Hk056LbHEcO4yQrXzk8qhtl5+1OqFJKzVkN7MSEo771lw5OsSK L6Aw== X-Gm-Message-State: AOJu0YyuUfjOcIr9amtQuzn2agz95P72772GYsDsd91HynjwZxt4tVEm 0CZODWWYyYNqdrjFsXn9O46d3w== X-Received: by 2002:a5d:61cc:0:b0:317:5de3:86fb with SMTP id q12-20020a5d61cc000000b003175de386fbmr1589727wrv.10.1694790533208; Fri, 15 Sep 2023 08:08:53 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ba13-20020a0560001c0d00b0031ddf6cc89csm1940914wrb.98.2023.09.15.08.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6067C1FFBF; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , Stefan Hajnoczi , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Joel Stanley , Peter Maydell , Laurent Vivier , Paolo Bonzini , qemu-arm@nongnu.org (open list:NRF51) Subject: [PULL 4/9] microbit: add missing qtest_quit() call Date: Fri, 15 Sep 2023 16:08:44 +0100 Message-Id: <20230915150849.595896-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 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) From patchwork Fri Sep 15 15:08:45 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: 723120 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436362wro; Fri, 15 Sep 2023 08:11:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6XZuPUj5ZkJwX8GhogsdgYhHD88vnVsfFyienJ5g55R7AHip9bIVPsT0oCRXkhRuYfT9M X-Received: by 2002:a05:6102:408:b0:44d:4dd6:7966 with SMTP id d8-20020a056102040800b0044d4dd67966mr1906601vsq.34.1694790688425; Fri, 15 Sep 2023 08:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790688; cv=none; d=google.com; s=arc-20160816; b=dLny3A+IAMbuKtafIVfNqOwkgX3Mq+kDYI9hR5UBQV9Yx4iffPxu5MwdzeIPxlAV3Q HeTj2KOr4porL5iy65Av5GIEC4HnlybLSg2nJrR237RRhFRMM5asjzJNfPKzhsLbhdSq PcSUxsRgCSHUV0KtG0PjJD9sF25tkR9HjKb6yP1yV/+3kEDpPApWr2qvuIYOU4WHwtIE cYSvqpubzVmncshibMWkYTwBmKYQ5FRCSYRju3gK/0uwoq8D6JLkLKC6H205tyzAymVF 5gwkqfpTnzl2FezD0kpax/bWeekpvKCTjmOjIRG4J+LZwdaFeuSp+qg8FcciJM0HoB2b dq7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+ODBQ1lRWFRqN+1C2qyimy7vJFOa6KXmE7+4RiDeBuo=; fh=xfkjUhzHS3E2Oldl3Y6EA/0pJurhODVvJIvqI9+5fQQ=; b=ndSgTK0JpIfKJkCro2gyB+69ufI7FgYgyLzzKcebANv1D2j7M/eDLipM1EDrpeFELo /YahtWMv70ETBjV00McoI+pp5QkRrR7cYXrfXzXTQCqnLiQ3ObD29u3Apdfaks9BGgsW X1LVUVFztuoB4COTeJ9IIhe+XZlykKXk/sP5jbWytN/esHM8k4ql4p7md6mwf6rPqV5r /5dZYbofLGPQdL6m4SdnRIqgRtQP02AAaJ2/HsEaTXQt7wCggqS4o5qkKVWvpt6F/43b BsHXCCCKP/LF8aFzLU+OhQIDd/48/xfGxKX4FODvRKc8SMnMRa89GEs3aNvfz/7LP9aJ EBtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGOEaIPm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n29-20020a67d61d000000b004409ad72a3bsi304451vsj.408.2023.09.15.08.11.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:11:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGOEaIPm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARU-0003Nw-Km; Fri, 15 Sep 2023 11:09:12 -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 1qhARJ-0003HS-HM for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:09:02 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARD-00029D-Ar for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:09:01 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-31c3df710bdso2082234f8f.1 for ; Fri, 15 Sep 2023 08:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790534; x=1695395334; 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=+ODBQ1lRWFRqN+1C2qyimy7vJFOa6KXmE7+4RiDeBuo=; b=zGOEaIPmSn8BaOw8q1kBbaL/FklbHxMxGOh5+lGt0leQfYgMtTHYgUxJl9X3dVLx7o vgx92S0BfRrPVGLoWi8jk/1uryIhbf9kM0JLxC/SyzE4s2nr0TFi06PJ7szX5OgiXwBx BcOP6gOTiWKQT7iUQofcMyX9So2S28ALg2LP81vfqvLGuNylKyqbgrR7UaH94OdNUlKR 9EQjJuvLTfdymOTD5aSLldZHyVikfFed+bGaBYVcSI6BxS46F2BaVFyFCmEnRSVyCdvA ozf0AZD/eZPSKvtQy49q7xIttjjzrPXfJ3QgvpuHrqJXX7Ex+hWp2kOUFU6jh7IiTF6n 9UBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790534; x=1695395334; 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=+ODBQ1lRWFRqN+1C2qyimy7vJFOa6KXmE7+4RiDeBuo=; b=kKWSLNyGfJCZihHVT0OdnwvcMF9kKqyH69T1J2lPhUtOHaXvG3wHhtaqAMa+GbQaWH 5DJMDv08HzXOwXn+qQ28kHMzlSZhX08hD9R9+HNoQpuN8nH01bnzE7MOwY9GMzssdmIY y3P85KtJtqGsl6GXnJcP0SAKDbTl2pocGM4pw7CllUvKYTCKAplfesA8jSrqYZ7fEy2f bEYoNwTsxkQCHyG5vnQqBS8H6EZUp4ERUUlZiWASnx+IrUWOXtsekdhOTY+yCtWqRBF/ n26YomhKf1wKPu4iBYJJ/maOq5Z6AwyuURfU/eC/9rW/5UXCxiijsSZvHGV43LRs8ATn 1mRQ== X-Gm-Message-State: AOJu0YybDMPg60Gw0Hw/Gz4nrU7thPdUVLQsUDnVCGl7ZFUjCcxqF70q /wZq4wOMxdW5R0/QFuyR0gNMAw== X-Received: by 2002:a05:6000:a1a:b0:31f:facb:e1ba with SMTP id co26-20020a0560000a1a00b0031ffacbe1bamr283441wrb.70.1694790533714; Fri, 15 Sep 2023 08:08:53 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p7-20020a056000018700b003176aa612b1sm4653970wrx.38.2023.09.15.08.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 79AFC1FFC0; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , Stefan Hajnoczi , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier , Paolo Bonzini Subject: [PULL 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Date: Fri, 15 Sep 2023 16:08:45 +0100 Message-Id: <20230915150849.595896-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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, T_SPF_TEMPERROR=0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 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 #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 Fri Sep 15 15:08:46 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: 723119 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436353wro; Fri, 15 Sep 2023 08:11:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKKsk6UtHArwOu14N9kofZrCUC3ZhYT4MldA95pygKfqYEJ9yOpHtqDEszicqDvvTPeb4/ X-Received: by 2002:ac8:5a87:0:b0:412:1703:f7e0 with SMTP id c7-20020ac85a87000000b004121703f7e0mr2325556qtc.32.1694790687618; Fri, 15 Sep 2023 08:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790687; cv=none; d=google.com; s=arc-20160816; b=bjg3Km0lt8F6L+REMuwO4NJl+poA7gr+0Hc+U4btyIs966CWKTGGXOJGgWwqOo37U1 YxGHc7vzzxxGuNasWR4BoUAJs1TOxj7mpjsFaxW68ZIp6pkQAQw98YgwocjV1E4VCeW8 ohbjRCR3N/Z+FQI8Sw+h5DSvILGBMycqeQTBYr6DVCaNS7wtg7zoPGKXo+tRTK49Z68F h6RJn5djgVIchPbIlZ1xbygcfBGCt3o2NRijUuayq7rysK8/QPBhSYLBOChltpQ+n7mT pOJHHfOsBfWNtsEWejz69W/awBdRuOooqUQIFwwNe6Sj9jkt0RmSw/hwIW0cyXoAb2/E 1B2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xTrovK4fIdtvshi0BSJ6A7SGaTiEX1KvDjEUM74fc78=; fh=uJSh4vw+SU6HCPQay/N+HSCEl0F9MB1HDd+C00vkWQk=; b=fS+VE7Ki8p67PTP1SgYvY5NfLioshPBK8hYIZmxsf/eyKtaIKPZ7Hu7avbUT06shfk 1AL7cGCW9m/8V/m7hFNAJPWcaZlG03s618cU3G6eYDfZxh2PimPuAhhE5TAV+ZLixzJ8 euhu3jafeD9vKNoHwv873zIaQQPRDUTlyqmi40D/sqUJTbFY+uDhL+onkXgr4zKgakCA L7OJfNArY7h0n9RoQN59NTMDHP0rUVLexiEa3y1+YJ6FNnqRVI0kuIRVruEga2ZccFwX EwwnG22X6mfPKcJfutm1EvTvlipG+wz2lEFZ9ILvDbDV47DP1yB+2L0B0PjUshJQsC3r kZ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZQV3TrVj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v22-20020ac873d6000000b00414f63ece8bsi1636860qtp.532.2023.09.15.08.11.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:11:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZQV3TrVj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARe-0003Xx-7I; Fri, 15 Sep 2023 11:09:22 -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 1qhARG-0003Cl-8P for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARD-00029H-HH for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-401b393ddd2so25870755e9.0 for ; Fri, 15 Sep 2023 08:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790534; x=1695395334; 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=xTrovK4fIdtvshi0BSJ6A7SGaTiEX1KvDjEUM74fc78=; b=ZQV3TrVjCvf9BPyQ5Fct6sxl/U6/q8f1SiYfjG8kX3XrfCXinXqXE0ANqHrw+bXZK0 JQY7Y3g/3im48WjlRr4xk6kloThVeSj5v243cOrQQMbt5vH06+upGzKIA+hpi+4Z1d5w U0jduwqzjAIdg2PWjRR4zl4xqozwGGJh0kKfKFbxzIaU20Bgju9/7idufEJ1v41Glili gtosfZ7iTBM66jgAte43pw27dzpAHWeMUBq0fEcr1x7I5X2aXXsa9n6eeXUBgArMyv/4 n3aRIHoZC5TSIgzZdjL653KbF/UUcm5bAUQV7HrJKp3XWpGGTRgcdrZ8Wtf8QrKCZJGi EtSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790534; x=1695395334; 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=xTrovK4fIdtvshi0BSJ6A7SGaTiEX1KvDjEUM74fc78=; b=HY+7kXCbkfYZhCE6lnZdaVqwKUNtDH999kZ/i0eCbM+nGihTZWNJyHHzN4k8YMS/gy BtaCv+y9u0VybciSnBQRHMK/YVbQrKuRrFBzVcEEw5801a0nxhbyg/JD+5fqe8OEiiVs bRSML3t4JdLdj6snMwRMRvHsnJAGx34FT7LuYHcJB7YXW/6Hn4INO/kKemh8slDlZEbp oAUiWbfUe0KNYNfVY5DtbUMsJq5cr49sn3Nd5x+hcvQAXtCTZRT3e0VVjOeBZJeRXjzA XlNYNzFIdWQrkj9c13l8tIt5TMlsf4BC8FcTVBa1wHBV5nssW0kk0kI71Ogf+Cta+Dtj t8aw== X-Gm-Message-State: AOJu0Ywrss2gnRH6YF3c/jeDvQ7BtjB0yZ/Eon6gPh7pF6JhfWoWlBkw Gm/wZoLuL5O/Ns17BCtXJtny/A== X-Received: by 2002:a7b:c857:0:b0:3ff:233f:2cfb with SMTP id c23-20020a7bc857000000b003ff233f2cfbmr1778245wml.23.1694790534095; Fri, 15 Sep 2023 08:08:54 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y6-20020a7bcd86000000b003fee6e170f9sm4857598wmj.45.2023.09.15.08.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 93CDE1FFC1; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 6/9] gitlab: make Cirrus CI timeout explicit Date: Fri, 15 Sep 2023 16:08:46 +0100 Message-Id: <20230915150849.595896-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 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@ From patchwork Fri Sep 15 15:08:47 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: 723118 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436112wro; Fri, 15 Sep 2023 08:11:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKor7qivKIrq6a2k0atbKlrH/psS5EDhSzc6hewTUPvzfSWRGqrGPHx556rOkfeyHVM14C X-Received: by 2002:a05:620a:450b:b0:767:f1e8:d38c with SMTP id t11-20020a05620a450b00b00767f1e8d38cmr2297417qkp.15.1694790665485; Fri, 15 Sep 2023 08:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790665; cv=none; d=google.com; s=arc-20160816; b=M+tQDrqCXbJq6kPlVBANg1PmMnpnPInPFGN7/vkQxgUWTSzZQMAP0DBzkyB/v5N/HS M9s+byCHifNZiq5pijekIGsEN3OVSA7sWfI0njDXQ3VZ74lxxGdeFQ1pKDYjycyaiu4K boBG+P9fFGHalJQG8crg9rFzuohuyDQNBrdlS3hbNJCv0hIeikUKIvif/YTQlosc0fbb MJftyFLvAgg4kmiKHPpFSr7F1PN2YQGYGk0CEtypiZI36Tb50Pr7s/9ekhkAQQi1FKlb JbYszJQ94qNdbKG9SL3Ee6bMNq2zKwDcUSVWVMTVUpajjJjcvvUHmoksHrSGnVlsCjRG X+FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l0mIdmdlmXswKm589oYcvupbnyEZRR+lBvL3XDXcnX4=; fh=hX5eEzduw6vwUSjCqmwXYMlGcwNnCjXa5XiiDQ0PJv8=; b=FDEPJD66vTGzK+OQReWfr5NsvtWpxg2Ms1bjulo1YMaCcjngJZBN1ikF5xv0CoAcFI Jsy9f5pjQ78nF62TJpRTnXbK67VXidcPptTu6gR/Mc4Lvzx7WtSGOBDqH5rXumic64T5 z9XQJ68ZItLMo8BOpsqKPdq4R9XRMObJkIpAHJNc9eGlIHGtRSK2kHc2eVovzZ/YrT5l R/615i4O7hdTu1Zy0w9iurZ+VbhCWvJpoNzuiLuZ5a0pSJuviwFyA0CB/2D9rFYlXCHp uct/O+CZX1vwrQJXp32MWBYmC3GQDkTyuNxA+AJdeIGSMlWH1NwIlHbDGuu6YI82gP7Z ymBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C9+a61Vj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j21-20020a05620a411500b00767c50eea70si2526078qko.375.2023.09.15.08.11.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:11:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C9+a61Vj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARe-0003Xv-6h; Fri, 15 Sep 2023 11:09:22 -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 1qhARG-0003Eb-U8 for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:59 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARE-00029a-NW for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40078c4855fso24310385e9.3 for ; Fri, 15 Sep 2023 08:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790535; x=1695395335; 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=l0mIdmdlmXswKm589oYcvupbnyEZRR+lBvL3XDXcnX4=; b=C9+a61VjONv3hLMulKsUUJ9Wxuuqwaa2PN+5O5pqY2k1I5B5f4lPG+lMNJS1JVSGlR GRTl/EsQUO4K2gFuqiM5cwINmZv+cSBm9frjSi8DjUIx3nRgSgyIr3JevSVWqNlcmZRe 5i5GftgxZPwLB9Xi5ahbdeHeQV3X7Vifbfa+hm666Egy7xrqSQ0QKbEEJ8CFbToptYPV Pm446ZBAgr2giHyFLxhMBFhPdgwO2PYVoUcAXKsdjG1GSWCPXKybOBLZfvb4G08FzaUN z/LI0XQGizdjH446VVV40ooTBDMKfBqovJw0akLsy/MkOn/4ZZRHNFrXBygd+P3NroMX KD1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790535; x=1695395335; 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=l0mIdmdlmXswKm589oYcvupbnyEZRR+lBvL3XDXcnX4=; b=JkyRwwTX95lxpfjTYCMnnqaRE3u88GSg5nvWtvXuWY87+lFtjNqXA+EUSioEEN78TF XGkjtb1m/6oapRrsAxMTnBI2egi21fncY+byXaKrOCQ42e6BdQV2pcKaRSsPL5CZms+L BA4sWS38+h2FcBpO0waEzCAFe9J3TSNJyouhV8eWHUOTwG2X2lOTp4CYvRCx1fhBnwoy hWl5YCsQJ4WHLZXP+r6G5T2/LKCEDTzO2Pd/aNzbyixpVYGxCbrSCaCe31nleEjmGxme xeqe7kEwMsJdjjrsaq2cE0B2swQNgI9hunT5YiW5Au+JQAJPioYRuzlBnrQqDTIrD1W9 mLxw== X-Gm-Message-State: AOJu0YwKVY17UbkVzB7DRD8PwpLVl8vkIl8JF/qGU5yZ96xUgp9c/S0Y CuonoZ64PeIs2SUveGC8cSZAjw== X-Received: by 2002:a7b:ca4a:0:b0:401:c436:8999 with SMTP id m10-20020a7bca4a000000b00401c4368999mr2031176wml.30.1694790534932; Fri, 15 Sep 2023 08:08:54 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l20-20020a1c7914000000b003fe29dc0ff2sm4927349wme.21.2023.09.15.08.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AAC231FFC2; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Stefan Hajnoczi , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 7/9] gitlab: make Cirrus CI jobs gating Date: Fri, 15 Sep 2023 16:08:47 +0100 Message-Id: <20230915150849.595896-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée 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" From patchwork Fri Sep 15 15:08:48 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: 723115 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp435270wro; Fri, 15 Sep 2023 08:09:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFe/SuIG2EpuxkN+GRFpUBejGYtWNzFBhUW+dpl9CWEgpJo3bfunyzMJO7RQVf0a4oSN1s3 X-Received: by 2002:a0c:e414:0:b0:651:69d9:1523 with SMTP id o20-20020a0ce414000000b0065169d91523mr2116016qvl.16.1694790585548; Fri, 15 Sep 2023 08:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790585; cv=none; d=google.com; s=arc-20160816; b=h5+sV62xF7WttjR/WtqcltlvtPxMZbsHvoIL/at3zNrgjIvpcf2VDxUtMz9H45X6SD Xj1IJX3Isy2iRrgK8SXVV9lXR6Jqb+Qc6ULLvvhl/BUHBmSsoihxOwVMgzawtC3mjnrn hikNo06na2vl6Ney8egyF3TCKhiCt3nChX5vz1As50cGYks20LJ3/XmILm/Ts2uywkCu KhA93+9XHv1UC80fvqJFmiW5EFzreShWEe3sydaZoZb/DJIwPaI/SL3D+MLM5Ntj9BPb G/SzAayOV6N50Er8F41158gkmaU6A+Iys6205A72uQORQRl/E59E0Na855Rd92ZsZOQq kqJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CcvLekfgkgzF278cqTU4MlqaFKkEi2GbfnC328zBuE0=; fh=DsCgdbJtKECnOY1fjYjo4d9wfAF6VXeyryDhRNU8UH0=; b=RX6nJxrM8zCpCIikRGLzhIsHhqnY2lRyNr17+9YATzpHA2uciqi0uNFBkKcxyK2zEh Cvq7fN1onW0Z1QLyqvfrJIS4+0sgNofQI3zH7JBeqaOdRHq+X5eMgYrqWQJHpquIczYi MTvYdHVyp1p3zt8j9Hu66g+BcKtX4iqwsMltF39Kc+H0/6zLD9SEL4d9We0SLePotk6P wd0zyS1huJGxPLxH22/DgrTYnyaWxLOZOf8Wt9+ahIj6DlPmISOg8ckM7IeH7yESCGGd L9LMqPE5dQCiu2gy6WNRQEtjGyx700yvYojDv/CpKO7qnc+rBdy3WVFPGRHdM3F33obI Trnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wtYI5RmU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p4-20020a0cf544000000b006563b57c433si533939qvm.160.2023.09.15.08.09.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:09:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wtYI5RmU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARU-0003P5-W2; Fri, 15 Sep 2023 11:09:13 -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 1qhARH-0003F0-J9 for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:59 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARF-00029o-LW for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:59 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-313e742a787so1485615f8f.1 for ; Fri, 15 Sep 2023 08:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790536; x=1695395336; 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=CcvLekfgkgzF278cqTU4MlqaFKkEi2GbfnC328zBuE0=; b=wtYI5RmU0grbK63HB4S1Uxo0NrXI+c/Xu0ig2rWdRkoNjvZkSQ7RqU2PNqRS1+Tn2N +NQz0QLq06Y4UZBrKie10r/rvtYTdfHcpVtWfSrgFnBSJaNlCh3rPBYAUHNgeoE0V1C3 V6vNxg3vdfyy0QKSG3PggGP/lt/T9ZKURIH/e7yovRW4630CL/phJE+Cqm+eZzUP7tLL styrDqGnRSXKcYK0UH9Jb81Vk3CLNiC74LJYyzrrtg1yjRD2TTZY8MLWvSVfXwnw3Bi+ UgqydRx/8FSx133hYP4p9oQG8JvsVLOQs8wdnOwuga4sZq8Nnu37pH55hI+RTp4tEpQE IC0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790536; x=1695395336; 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=CcvLekfgkgzF278cqTU4MlqaFKkEi2GbfnC328zBuE0=; b=XviFIel2H9cxkfZPgfB9TwDVcD7JxxGYv0jvlTjlBM1nDKR4g7sUoDiJQQuBTqVVYA Bwh+w8YS7NGJ0VPQONf+KltR2Z2X/6Tw6/jNsY0mZC8827fWqz/kobGtLpS5V5R86Yyg BQXnAHaI07JiM/Gnr4sJsQldIfqkyNhVgtu+cpBW0OyviTzF8Sgow+MLWjBnjCACGqby ynxpUm+fzrc3LyWObeBis5GOop5UKHXG1EuZqy6iViaCDbatj5ibJukGT/cDgS0dsAa5 yH9dqQmuzI3YbI0kKOQUPYT6UTLlOn/AJeVU1e4euFmiIhAmJsNUM/kJepMjKFnwy7v0 iyxQ== X-Gm-Message-State: AOJu0YwOwhKH1iOMS7DbO4Ks4SubVWuY9U6OiPh7pZy60jF25uipNw4J yDKalMruicMHi1sIWSJp+g5VMA== X-Received: by 2002:a5d:6585:0:b0:317:dd94:d38b with SMTP id q5-20020a5d6585000000b00317dd94d38bmr4283710wru.10.1694790535961; Fri, 15 Sep 2023 08:08:55 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z25-20020a1c4c19000000b003fe29f6b61bsm4832634wmf.46.2023.09.15.08.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C44E81FFBB; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , Beraldo Leal , Wainer dos Santos Moschetta Subject: [PULL 8/9] tests/avocado: Fix console data loss Date: Fri, 15 Sep 2023 16:08:48 +0100 Message-Id: <20230915150849.595896-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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> Reviewed-by: Philippe Mathieu-Daudé Acked-by: John Snow Signed-off-by: Alex Bennée 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: From patchwork Fri Sep 15 15:08:49 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: 723117 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436106wro; Fri, 15 Sep 2023 08:11:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqIKFS+3EYLHn3hUm9tDj2TvCqbZJxFLUX9+DW/ka3yLSHf/wndejRzLzw1V9eMydwoTzl X-Received: by 2002:a05:620a:2682:b0:76c:ea3f:9010 with SMTP id c2-20020a05620a268200b0076cea3f9010mr2022729qkp.16.1694790664804; Fri, 15 Sep 2023 08:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790664; cv=none; d=google.com; s=arc-20160816; b=vhqxZm23gVqWvX/kKWrzHCASWpBfK7DMJMqZ6BVFnz4ekVRXKiGvW2njdYe0uER99j Jg6D8AUbyeDZXVmXb3MAQKpW6/cMDrNOJ/iGuhv4doIXy04zSeLsFbJlUSqdinHnUDmE M/q5W7J6ILqf997Xgc7Tp0gSIyC30ss1AFt9V/q8NwDYy4Esx8bl8o/5yXrjrSOAo47u oXd4YUDwh6XbHyi40VmBGw4xuie+n0kQf0MSclWQYP2gncdTsLeuU+A0z0qNkI4mjVP2 b75UaHft8nMxUTr1DOHcftUnNbrMZc3Jl5xgWzzPjkDDN5gDQNKMxK9+Lk46vgF7mHyY wEDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SpdZx8AhfyM9DvxuaSn+YqR/ZDFVc/G0t+hRFJe45y8=; fh=AYJqpxfx+UEEQSy3EZcRhPK0yIvvzZ3hxBsj9MV3GeM=; b=yZVtFJB0ivgG/l0FPJpVVOqIg131RKkUrrA78yOHdfxlaJrHVqYXVnl/BVaB+7BzIe jytxkY4MUDBLp5U4poewqa+dr51kFmsHjvxDNNvPg8ezPTfrlc1U9lx3Sl7NH7wO7tsa Fjx/848EcidltokqqRBsbnpuPXjv+MRsAkj0DXqiqBtAnHPVwADw9a/7Q2NcifkjB+AH N2Xcba27xm7WBD44npT+P3c4eVMsIk6y03MDWD8m5/ItfFOXr8lIBUClqpYGsLUmQmzj uFLxOWfTxjUopjZ7Jhvq8hp3WHI6y+bMu6tnXF9TQTje7UlUIUxdjezcFVNSulXQ4mWW 4+8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sRlG5p5J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id sw4-20020a05620a4bc400b0076ef599d407si2350769qkn.56.2023.09.15.08.11.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 08:11:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sRlG5p5J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhARU-0003NL-Gw; Fri, 15 Sep 2023 11:09:12 -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 1qhARH-0003F1-RH for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:09:00 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhARE-00029d-V8 for qemu-devel@nongnu.org; Fri, 15 Sep 2023 11:08:59 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40473f1fe9fso20226595e9.2 for ; Fri, 15 Sep 2023 08:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694790535; x=1695395335; 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=SpdZx8AhfyM9DvxuaSn+YqR/ZDFVc/G0t+hRFJe45y8=; b=sRlG5p5JXh+HAN1yPJM8xnqVBuDYoVC85jxCONXFvR9k4UwzmIsctgQFvhXbL0WeHI 0cj22nRu2qUcnQnyl0nbD96FvmIYKWBTwUBxDgyZ69cQpvgTDs8qoKxqH+45lgb+YaxP 3K4MhqanOTQj+qTAGsTGJAjt71tzRu88Hmy8t+NWl0I+IoAjwJQLCWSKnAT5TTZMTeI2 JtVK/jZHERABEGdrnoeSINn7V0pa2xexIo433M4X7hiB6Y6jBVkI2A3ES4jVvqCG4hLO laXk3TfAX9ywu3Jan6Vyhf57eHGGhnYW/EXe0rqFozKVIGmMqU7i1uyMz3bBsrk27GNu cz+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694790535; x=1695395335; 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=SpdZx8AhfyM9DvxuaSn+YqR/ZDFVc/G0t+hRFJe45y8=; b=aK1l+J62SVbFDfFSy6TdPpXEpCv5W8LRXgYHD7Pgy3E2nVzCGQBP+D0ztjGC1SIuv4 KjTLGvNscup6PaIP/HRxcJ29KT73f2W/R+kqxvZ/sGAE3SQQyQcJ+T4tYEm96H2zM27I BFitUriB5JW5/RV3pM/mGQRaSysDkIRbfLvp6c5jlmAbpsZEmC2+lNPVBIhnjOL54Hb6 GDC75W+DtmPqsGw6FqV92sBbXNcxVFwF39rvyKv0nIN1J/XqfdPYgmeBkGI+wOpKstlu tm6f3iWleI6zL323JBpx8ueMePMvOu7hqHlpuZxzEttuGRqtG7Uhs5E7JLGlBxZusT7b +BeA== X-Gm-Message-State: AOJu0Yy78KYHkCOWl6uems9eT8GKr2tzi+uT4SdQ77ZjS4f/jngRkuKV 2VWmWXTeyGzFIMRfQJHOgTZZww== X-Received: by 2002:a05:600c:2288:b0:404:7865:bf4 with SMTP id 8-20020a05600c228800b0040478650bf4mr1727405wmf.39.1694790535164; Fri, 15 Sep 2023 08:08:55 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c029000b003fee8793911sm4864159wmk.44.2023.09.15.08.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:08:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E63FB1FFC3; Fri, 15 Sep 2023 16:08:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , Aurelien Jarno , Pavel Dovgalyuk , Paolo Bonzini , Jiaxun Yang Subject: [PULL 9/9] tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 Date: Fri, 15 Sep 2023 16:08:49 +0100 Message-Id: <20230915150849.595896-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915150849.595896-1-alex.bennee@linaro.org> References: <20230915150849.595896-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 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