From patchwork Tue Oct 1 10:51:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 831870 Delivered-To: patch@linaro.org Received: by 2002:a5d:43d2:0:b0:367:895a:4699 with SMTP id v18csp303898wrr; Tue, 1 Oct 2024 07:08:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVILnUQsPRxNIVcU062bZWUpcbr9RiNoYgOoksI0788gJNGFY3ofLnJB8HNSuop5qy6ABEtsg==@linaro.org X-Google-Smtp-Source: AGHT+IFAya3X70NKaLcT4eQ1w22LjifLGqaDKe0+IeGP71oKv3ze26Zy/8q/wGLUHdYsCsy55uIP X-Received: by 2002:a05:620a:198d:b0:79d:536f:7b3a with SMTP id af79cd13be357-7ae378dbcdamr2726262985a.56.1727791718752; Tue, 01 Oct 2024 07:08:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727791718; cv=none; d=google.com; s=arc-20240605; b=earWz9zrQYijTNKGo4F/PiXUDZlaWYrBBkREHsDDI+31rrcneufVTJ55UOUZMe2lUw ti3WVTijdPWCFdXQ2eHOrCEkfngzw7vWUXfPRcvNpXjNO0pyYPmOLsy9Bsh0r1NzqceQ 33SXUiDOMsRzU06qANm5vabTABMqu/uHPkmeF2doVw0IVefC+7kQS0N+Ry2N+Yme+yPt m4qwGgwLLg9FRN7R7eYVUwoC0je0pe/LFI9O4opYC1KhezsIy56GWf33acsEY5Uf1q5l b1MtrswAYJetwew6R085gfnZzoJd9yTzrHKY6uWumCtjvB2qBkaNisJGqJGVfKONC9Vv QJlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=z/5+rs0r508iREfL2v3FN+6adWfn4Z6/mf996ngU0Ew=; fh=zDkKNAhe9ig8nYBXBgOIfIRnKwnGR6UMYrYQ/f2SQT8=; b=bmopj+K10hhcnW2qact4mKMQ+BsTIvNbDXH7qRbEKVwe1dicJ4vfFGNBDw8VmrdVaP G0voAXbzN+bh799LN/b5N4TDc1XJ1lNvfg471Rb1qvRYn4ENt3DFc2oVyTzBl9wEKlUt 41zuYsVkMqAK8YCTB3lmvrFrfG0T95JIq8ELPN8A7Gf1/FaWQ/chi1SJxoeO1yAeIXon 4XDpYzGKjxoMTrXEEiCSQDPAkbFTq1Kwxyy+n4DOCuF9Mw1bBDdMNpr0gi9yPMO6cJAV sPmmuQTQZ3wDNaj6NIQyIPZNPAFABJfX8tkhT6Zs2dEDMgvKciREBxQoZyUZWnRwv0Wf OY6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eLryQqFy; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7ae37838b60si1053650585a.371.2024.10.01.07.08.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Oct 2024 07:08:38 -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=@redhat.com header.s=mimecast20190719 header.b=eLryQqFy; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svdYA-0008JS-Ag; Tue, 01 Oct 2024 10:08:26 -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 1svdY7-0008FW-Ui for qemu-devel@nongnu.org; Tue, 01 Oct 2024 10:08:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svdY3-0001s9-DG for qemu-devel@nongnu.org; Tue, 01 Oct 2024 10:08:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727791698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/5+rs0r508iREfL2v3FN+6adWfn4Z6/mf996ngU0Ew=; b=eLryQqFy6dm/1/mRrAUO0Rs4dAI7+sZ5bmVI0mE6e2yeKZGBQBB5V8QwMPtowopY4DLDp7 6mnhFGFVdnQHgy88ZqVp97mp4LFG+o5ut7CHNswsGR9pvyo+SxoH+0d+L3rZbQZ493Yt1l bjA+iNzxMAf7CuzgAyexuD8h+PVWwD8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-dyMZVtv6PuG3bgoh9RU8Ag-1; Tue, 01 Oct 2024 06:51:58 -0400 X-MC-Unique: dyMZVtv6PuG3bgoh9RU8Ag-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C8C8418E68CB; Tue, 1 Oct 2024 10:51:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.152]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 03781195DF91; Tue, 1 Oct 2024 10:51:50 +0000 (UTC) From: Thomas Huth To: =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [PATCH v2] testing: bump mips64el cross to bookworm and allow to fail Date: Tue, 1 Oct 2024 12:51:48 +0200 Message-ID: <20241001105148.74182-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: Alex Bennée The mips64el cross setup is very broken for bullseye which has now entered LTS support so is unlikely to be fixed. While we still can't build the container for bookworm due to a single missing dependency that will hopefully get fixed in due course. For the sake of keeping the CI green we mark it as allow_fail for the time being. Signed-off-by: Alex Bennée [thuth: Temporarily remove the problematic packages manually] Signed-off-by: Thomas Huth --- Removing the packages that depend on mesa manually helps to get the job green again: https://gitlab.com/thuth/qemu/-/jobs/7961678029 That's of course just a temporary fix 'til the next update via lcitool, but hopefully Debian will have fixed their distro by that point in time. .gitlab-ci.d/container-cross.yml | 3 +++ .../dockerfiles/debian-mips64el-cross.docker | 20 ++++--------------- tests/lcitool/refresh | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 34c0e729ad..c567926182 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -49,6 +49,9 @@ i686-debian-cross-container: mips64el-debian-cross-container: extends: .container_job_template stage: containers + # Currently waiting for Debian to fix: + # libgl1-mesa-dri:mips64el : Depends: libllvm15:mips64el but it is not going to be installed + allow_failure: true variables: NAME: debian-mips64el-cross diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 2862785692..4f3277a3a6 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch mips64el debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch mips64el 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 && \ @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libgtk-vnc-2.0-dev \ libpcre2-dev \ libsndio-dev \ - libspice-protocol-dev \ llvm \ locales \ make \ @@ -48,16 +47,15 @@ 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 \ socat \ sparse \ + swtpm \ tar \ tesseract-ocr \ tesseract-ocr-eng \ @@ -69,8 +67,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-reconfigure locales && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -97,17 +93,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libcmocka-dev:mips64el \ libcurl4-gnutls-dev:mips64el \ libdaxctl-dev:mips64el \ - libdrm-dev:mips64el \ - libepoxy-dev:mips64el \ libfdt-dev:mips64el \ libffi-dev:mips64el \ libfuse3-dev:mips64el \ - libgbm-dev:mips64el \ libgcrypt20-dev:mips64el \ libglib2.0-dev:mips64el \ libglusterfs-dev:mips64el \ libgnutls28-dev:mips64el \ - libgtk-3-dev:mips64el \ libibverbs-dev:mips64el \ libiscsi-dev:mips64el \ libjemalloc-dev:mips64el \ @@ -126,13 +118,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ librbd-dev:mips64el \ librdmacm-dev:mips64el \ libsasl2-dev:mips64el \ - libsdl2-dev:mips64el \ - libsdl2-image-dev:mips64el \ libseccomp-dev:mips64el \ libselinux1-dev:mips64el \ libslirp-dev:mips64el \ libsnappy-dev:mips64el \ - libspice-server-dev:mips64el \ libssh-gcrypt-dev:mips64el \ libsystemd-dev:mips64el \ libtasn1-6-dev:mips64el \ @@ -141,8 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libusb-1.0-0-dev:mips64el \ libusbredirhost-dev:mips64el \ libvdeplug-dev:mips64el \ - libvirglrenderer-dev:mips64el \ - libvte-2.91-dev:mips64el \ + libxdp-dev:mips64el \ libzstd-dev:mips64el \ nettle-dev:mips64el \ systemtap-sdt-dev:mips64el \ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 92381f3c46..a78219f7bc 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -166,7 +166,7 @@ try: "x86_64-linux-user," "i386-softmmu,i386-linux-user")) - generate_dockerfile("debian-mips64el-cross", "debian-11", + generate_dockerfile("debian-mips64el-cross", "debian-12", cross="mips64el", trailer=cross_build("mips64el-linux-gnuabi64-", "mips64el-softmmu,mips64el-linux-user"))