From nobody Tue Feb 10 03:56:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663175375; cv=none; d=zohomail.com; s=zohoarc; b=Zs5YDQQF2335Unm1w9uCm8/E84rLd/2G7EEOnZ0jgKJE082jgBgVoX8d7XuDpMkYp7uozvDc3COki+fJh2XfCVRS3cqVnr38MUPsX/BWD/aYu5ZbUHy8gxuGAhmfLPPwbGDgTI+s51T6cQmzDQk4OiYI7M0oBjk2YVn00VVrGe0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663175375; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=gw1gM7JixS2oIbUwW9v4KvNj33h9XMFbmc8cr8XLSHYpyJ3t/9SM6FQmsMty1Uyv0w6moIRbEZ1rZnwLyC7AxVEu/omH9GgGa1zOo4rFuJ9JD7pup0AjwIKRmIySeWGunhGpkxAkAFVukj9UBMhcflmGCUiqy7lUUT61PM1DGEg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663175375841799.1714877657795; Wed, 14 Sep 2022 10:09:35 -0700 (PDT) Received: from localhost ([::1]:48188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVtF-0002sw-4b for importer@patchew.org; Wed, 14 Sep 2022 13:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUuF-0001e8-Fq for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu0-0003rb-8u for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:31 -0400 Received: by mail-wm1-x32f.google.com with SMTP id az6so11958912wmb.4 for ; Wed, 14 Sep 2022 09:06:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v8-20020a05600c12c800b003a844885f88sm16592326wmd.22.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7404F1FFB7; Wed, 14 Sep 2022 16:59:52 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=sjwCTR7PmJx8+DRWxVBvgcAqG4qLkTz2TrfWfaHptV5znz7L7aolf0EJBIum9OHra/ k3Y3dFJebVC8nIZkms2QQLIY8LOM7TnIWHeMNfI1IoMGaGH/4pDF2P2ApEbMdnlTePwR fsJ4z5kNv//b/G5k/kdJjggvycOY4vuQsb4y9GELOeUGqCLsNDhU8gYQdvVjKKiUuQF8 vGTW9zs9GHz9e2NmU5uhG/tlyVixWXXzZUwGs6VFtBX61P/LzNyZJsq0i+hRnQbsZQgi VXM1YaIShI+AMtsT3Gm/h2rvM4C/IJB3xvClT41gEoEIkm3f5I9COz+6RzgiSg6ZulUu TADA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=LO4MvJvb3uIw3ie9FbaAGqAQlFJWQrprYP8XhGIC0CsrbxAGH0VWhJe9j5W2wsKv2q EkpLGuROBitpO7uSZWZ+thiLgo079wMNF1pSei3TxnlK8j+YjfUPo1kL7NHElrR7bNrT jJ2DTfdFCItOkDJ46FbhrPUd3sBBDh3kWF2ClmYCYG21kcY54FhoYVOxn3mHt4vtyAIz 0VTSDiOO8VsfT3QqUad+XKgvHnYyi8oXoilCmvML4NnP5cZ2XAxjP17ZkXG+VM7K4qDb v1uyaYS2ERKYcziHf9JV60XwfJApLcm5WIh45JVKm4KNhjWzFlxfyQGT93cuYg1+y9xV galA== X-Gm-Message-State: ACgBeo1W0t64bYzAtKqX/PhnETG9ySUnsPs5lQTuk3R9g+t/AVzU6cfk 2uzX4NOsc17Y9JDvUVEWnoNcsw== X-Google-Smtp-Source: AA6agR7FuzmUdMqp3x/zzA9Kk+uki6GzZbhuk7+Qt35NmwWeG3wB7NwBoxSSuhlnqvs/FMJAl2v0/w== X-Received: by 2002:a05:600c:294:b0:3b4:794d:fb6a with SMTP id 20-20020a05600c029400b003b4794dfb6amr3708906wmk.128.1663171574756; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 23/30] tests/docker: update and flatten debian-all-test-cross Date: Wed, 14 Sep 2022 16:59:43 +0100 Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663175378327100001 Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We also need to ensure we install clang as it is used for those builds as well. It would be nice to port this to lcitool but for now this will do. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20220826172128.353798-18-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - move ccache/clang/git/ninja-build to main insall stanza - minor comment tweaks --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-all-test-cross.docker | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 3a8bd75473..091c0d8fcb 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -14,7 +14,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 24cd44e667..ddcc502049 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/de= bian-toolchain.docker \ $(call debian-toolchain, $@) =20 # Specialist build images, sometimes very limited tools -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..2beb077fb4 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,24 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim =20 -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ apt build-dep -yy qemu =20 -# Add the foreign architecture we want and install dependencies +# Add extra build tools and as many cross compilers as we can for testing RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ --=20 2.34.1