From patchwork Wed Sep 14 15:59:43 2022 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: 605779 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp880171lth; Wed, 14 Sep 2022 10:08:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR4lTOYOXQCvpXssqP4AOCA5fqXwgcYPh3Mf41258kQ4PgOjjosN9WY2VGOxOf6AQOZxzjcc X-Received: by 2002:ad4:5f4c:0:b0:4aa:7121:7a with SMTP id p12-20020ad45f4c000000b004aa7121007amr32201523qvg.63.1663175312091; Wed, 14 Sep 2022 10:08:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663175312; cv=none; d=google.com; s=arc-20160816; b=JQ5XTNaN/fsen4z3aAO/DGtm6zNQOWfI+x2fsYbR4HCFkc+/Dmewu9GQ5cIjOLW76r T1pGpUg09IynqTR6kqRKAjXIx7rbbuePt17CH1H+vcXIrSrD3RcgAs+qlMzennkkshad ist2d4g3GrsJE8t76mTUejM50hULnFmufZe9gjQq9oa0exq6q6JduS7akWyCXkVfJDWy DsfKt5HnLJiQ2mm+H3cqUpFlSPl6zSPI/2vmpRlCENKOv8sT7lbLvfX1e05ZsDwNHv6W knmt8ijngWdgxOlcYKukMze2ZgH6g4grKfLXLLljILCgMkkNYBxlF4UmycIiE8iYzftC 2+cQ== 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=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=pQpWvs+GrxPtDurMUJ6uD0JCnYQz8uN/60HW21HpPrzsIex91F++R6qTO1bf/15LTi LECEG4pRaFvevx8KHEHSX2eBboAbG1hVBAETYdojUzNCA1LirWH/MODiTaEdmB262fAN 7Wul23y9rJwGGYhMbPk4V5zmawiv59pDVSL/GnSOFMMzx39/hQpLxiqMyiKe5ehEE2AO Rmqh/+4HZj2UWzKUW8UDWiUQGd0Vh1nw9fcWmb/o/Xj08USIFMRmG7+Wz7buKf7dr0+F 5SmUI4IFfIvYDZ9mBUi/n3mJI1rZSm3Rl/aQET2SpdcpJ1T0Y8GbCuZv75MBsfZk5giv JN6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sjwCTR7P; 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 y14-20020a05622a004e00b00342f823157dsi646801qtw.235.2022.09.14.10.08.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 10:08: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=sjwCTR7P; 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]:35192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVsC-0008WH-4J for patch@linaro.org; Wed, 14 Sep 2022 13:08:28 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée 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-cross.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 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)/debian-toolchain.docker \ $(call debian-toolchain, $@) # 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 -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ apt build-dep -yy qemu -# 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=noninteractive eatmydata \ apt install -y --no-install-recommends \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \