From patchwork Fri Aug 26 17:21:06 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: 600287 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp554233mae; Fri, 26 Aug 2022 10:22:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5vhYchYP898xOPwqU0ZZpgDWvVmywPIy0NI0uGJ1yGXRZnorN+LngXyt6qqUfX2RMz6bxS X-Received: by 2002:ad4:5c6c:0:b0:496:c323:6f87 with SMTP id i12-20020ad45c6c000000b00496c3236f87mr621030qvh.62.1661534574933; Fri, 26 Aug 2022 10:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661534574; cv=none; d=google.com; s=arc-20160816; b=J922xSB3o0AAX6EOHKhgtL1tiFYzG6gTCqHIxgfr1ysLlYGykvH49O416APcETw8YF RWA+5fvFQgeP+Sjeghq0Uhkj+1sPUUXcAz/LMbXewIhWuj2B3YcP6uyvK447sIn7fmnF bnD4Z24CidXTW5vTmqrNeisJtJbaNAYK1rv9UM+oWwPWtU+TA5pqrl9fVyX6QXzjzS/y O7xsh/UYKBqRWAgoLL7zXHyA1/10Qc+ICA8yE5MiLopdpCoTP2oDFFcBg/RS1YjcmY4F Cq7/pgQ9s5pMRjjTobryhzRPxOmi3+ApYqvTsm8G4ttzEjsnuypbAi+JKvLJWnm+ujSP rNPA== 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=vrxLvc9/OG1xl6UAcg3RkOGNLBO190WLVRXVgXWeqiE=; b=VfpcfbHkXcoRwCanmrWJxz/BCjh1wC1bMmmvWb0Nco4wj6sCDsQrQl17d7/2AMya/4 502GnYOdA5Grov3mxMA/0yt/kB6hKaWQ+FE9/YwdBAXdcAImftVHY/2Hd/SswNCU0q0B r6KjPOl4HIt4X3/3kPS6CUHR1lgdknsT2wisnvR/WF/BuXm8fcCEz016dqGDY/I0/zaI xQ141g9h461C6JyHuKGKJEYXN1hn1ANpQvOu6VU1V3exq0OlTnpifh5p9MIejICzRonZ i0NI+TAV05nxMn7SxqRlKkLV5pyKl6xBAEVmIQ0D99miajwFln85ADr9CsDPtMOb6oZm JPXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HyuMyt7W; 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 r14-20020ad4576e000000b00496df47caf8si107690qvx.310.2022.08.26.10.22.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:22: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=HyuMyt7W; 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]:51280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRd2k-0004IZ-DF for patch@linaro.org; Fri, 26 Aug 2022 13:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd1T-0004Fg-Oq for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:36 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd1R-0002KA-EE for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id d5so1212705wms.5 for ; Fri, 26 Aug 2022 10:21:33 -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; bh=vrxLvc9/OG1xl6UAcg3RkOGNLBO190WLVRXVgXWeqiE=; b=HyuMyt7WnIF3R7sLMlfOByKMvrRsRjD6ccwXrHJsCDvoj4x0wvJl77pu1G53tCytYQ 2YczzqkbiCfilQyNnAk1zkKxBtUt/eiQd1HwMMBe+Vyvz8Tog2jDOmxMbtF+l+Sdr+a6 zYdgHxHLf857hh22yWEuUAQBXyHjomiKJAfO/3oR9y7E5769Kb0Gd0E5anBMmv9KjL94 IyHaOmblhpx6rC7T0bKyOuAOATDjCmc69uFdB8tyER33UaIlHm/QM53mwMoH3sTtTS0o nbAtgmP+2fq5CgzKei8G6XQRZe1m4ciOLEbLY/dn3tI1b23/hgtXwUpa2i3LUfQ59jMT eWBw== 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; bh=vrxLvc9/OG1xl6UAcg3RkOGNLBO190WLVRXVgXWeqiE=; b=3iPDl0fvK38ZOeHX5iA28QoLRD8d3Hu4BKiOEE4ZjbGuTC5of+SxtpoqGoNCxt8BQU Ms7oSC9ZN7mFFKZMJUBxeu9KJRYVgZRzuqtZXjFqgsqUtSduntpvf9fxhs6dsKFA7FZY yf+HVikkX7uaZPod+kpCg+zH37tqGD+aZvo8zPF+XD8YX/ToMOVzHYDdsAMra3hNwxgm MWr3jOk3MetPl/1F9mqCXacidSVQQsp4H4A+kGrhfgn/qzX87ebn5O+u+v+BERMp7Rnb uwv5Bq5b0llgp4UnkhQO/yRlXb3SNLpaT82SZhIbNhf5g7DvirBkMR4kryrTkZAZx55j zVhw== X-Gm-Message-State: ACgBeo0EMW+0iHWRanORgh8OEoCtvat/GKDUYOyvOHHzGJdB7EShfWiE jo5bjI0LCQe/WpowDE6qTrzyqw== X-Received: by 2002:a05:600c:600c:b0:3a5:abdc:8ce4 with SMTP id az12-20020a05600c600c00b003a5abdc8ce4mr383609wmb.144.1661534492056; Fri, 26 Aug 2022 10:21:32 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t8-20020adfdc08000000b002258413c310sm237093wri.88.2022.08.26.10.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:21:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E9E361FFBB; Fri, 26 Aug 2022 18:21:28 +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 v1 03/25] tests/docker: update and flatten debian-alpha-cross Date: Fri, 26 Aug 2022 18:21:06 +0100 Message-Id: <20220826172128.353798-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220826172128.353798-1-alex.bennee@linaro.org> References: <20220826172128.353798-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, 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 really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-alpha-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 505b267542..802e332205 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,7 +1,6 @@ alpha-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9a45e8890b..c565aa5e7b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 10fe30df0d..4eeb43c78a 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross