From patchwork Fri Aug 26 17:21:19 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: 600311 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp569139mae; Fri, 26 Aug 2022 10:53:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Ab7BvqUq2tkrM+EEoh7skiWxiOO9qtMJIpOOST0yg/aOKWWnhDNyyR6ca8w7MEY9CqPup X-Received: by 2002:ac8:7d03:0:b0:344:b890:c6ba with SMTP id g3-20020ac87d03000000b00344b890c6bamr770903qtb.400.1661536416697; Fri, 26 Aug 2022 10:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661536416; cv=none; d=google.com; s=arc-20160816; b=i/xJtkZ+X8vODg7sxFToUWsmishjit7nZHZX6uTbbTX4oCUJ2shk0uSGuzbdFMAVjQ 3gM/E1rZ2tTaBwy61JPR5WmTmOemoZS3KE/t/TtGXVALdwrkW1QJfXRs0hISTmSg7/GP et1LGUfG/GryEq2y5NydJs2w0MKTx4SrjzAm+lsXlBOCtp5bhiK/GCL2kGjWvxN6RN5o 21vlc7THcx0HcMY/69MW37V8MAhZjahSQu0ccBy2DCdKittpBKt+RRPS1rVpj8PdqKJh 5qla7GzYSDvGLl355rAGeB5Sq1YQdR5vVSTs26ZEPdftazMAnKIHrQvDOcTywh2kMycW elbw== 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=rs4UzZwFXide81aBRRsAexooSiW+xU7JJQn2OmaFS64=; b=hiEAMBFVQa8Z3Q6mo5sHZ8E/gTxQUBfNRBhXSratW/j9Y/OoM5dp8oVzn/BRK5FzVu ZgES2Z+aLOtwaLnKA3t4fq5lO+fLRVsX/x+j6VNpDjGhd41VPvfZUJ4zl33QCAV6q1GC y2UYFUaiQ8FOXA2//6/TDxDha5vaaf++NvSq+lW6zDp81TbZYHbEOOSz8qOGvCcQ1lTv +E5qe6UIuQutTLFyJK/txJdEru/Yx0zPvvwLxlVr0k2PKmr9/nRlJLTFE75clVDpy91v u7lDYUIme8gHCMvwwg//JT7R32Ke1HFHYQjHUx1qb/ec0LyUfzazIDyFKtLEzN8PafPR I/cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="L8eQ2/eS"; 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-20020a05620a080e00b006bc422bc925si119844qks.148.2022.08.26.10.53.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:53:36 -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="L8eQ2/eS"; 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]:49892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRdWS-0001fV-9R for patch@linaro.org; Fri, 26 Aug 2022 13:53:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRdJi-0007g1-VJ for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:40:26 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRdJY-0005P2-MD for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:40:25 -0400 Received: by mail-wr1-x42c.google.com with SMTP id e20so2590511wri.13 for ; Fri, 26 Aug 2022 10:40: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; bh=rs4UzZwFXide81aBRRsAexooSiW+xU7JJQn2OmaFS64=; b=L8eQ2/eSvKw7RRS0HPrMlfrJRYezIEXrMweoI+MxrTWohaEYv8FiaBCbi9+m7CVHdz rFAm3ltdZ6EujYK6ePgIOzMKuFwy9pqY/f8rJneWD1uq5cHeF+tpApLH4fhS6VdLrzcX uW79qDPiKBxvWnxiMFVgQf1PELLvtOXd536c+N0E7BzS66oW04BAsHMDM4DGTBibn4pQ Wq+MUsK6I1JlvZmHO0B4ZQBY1+BOi1uhV4+6ry5SOkZdQwpUtK2HH8ZGLWwxsfSlS6Gh sJoxGTyWGVYd/xOCNkiy0wJMLpXjxfyMV/xy8QU+q2wiqG6BGD+V8uGv9+CqFqeaqP+U 5Eag== 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=rs4UzZwFXide81aBRRsAexooSiW+xU7JJQn2OmaFS64=; b=lwEcXnZ1u4SMiSdtIzQxKutnCOQtZDZhZYE8JbhN46WKCBA0rf8ZRdApD1g71MCWGP ArSxVWiskIUgY0PqnEa5NjjpS0OJKTZ+Gaw02CUGSP+YL/a3+XPR1uu+lig5bbOPC7KO FDUqWG9ZwZm1iACRsJJBtqpUrmacJxxaZ7ZlxT30ce7MQY3RiOAj15+n61BDfkE9GxjV 2o9yg1YXp5Sp/fWmpmY9v7gy3pBDXg5gi5LffeqiCPULNYHCWBIv/Hh58t1F68ZkTzyl ckW2qcCeM3bDPr9R0TQh4fI+/7CdnJznZ7uKRLIZNLaCc/YVd/g6T6oMAh1wBzEPxKhC wXbw== X-Gm-Message-State: ACgBeo1LUPKeGnW1GqT8EYElkF8cSzcMgqGWbkDgvMiMa0TxsefbNLNo syR3uu8/JhKaEK8zni9eezmKZA== X-Received: by 2002:a05:6000:1448:b0:225:63f2:2421 with SMTP id v8-20020a056000144800b0022563f22421mr380862wrx.527.1661535614647; Fri, 26 Aug 2022 10:40:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l4-20020a05600c2cc400b003a502c23f2asm280678wmc.16.2022.08.26.10.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:40:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 22A4E1FFC7; Fri, 26 Aug 2022 18:21:30 +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 16/25] tests/docker: flatten debian-riscv64-test-cross Date: Fri, 26 Aug 2022 18:21:19 +0100 Message-Id: <20220826172128.353798-17-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::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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" 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 --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-riscv64-test-cross.docker | 10 ++++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 95d57e1c5d..3a8bd75473 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -122,7 +122,6 @@ riscv64-debian-cross-container: riscv64-debian-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-riscv64-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b1bf56434f..24cd44e667 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -133,7 +133,6 @@ 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 -docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker index 1d90901298..e5f83a5aeb 100644 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -3,10 +3,12 @@ # # This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian11 +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-riscv64-linux-gnu \ libc6-dev-riscv64-cross