From patchwork Wed Sep 14 15:59:42 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: 605776 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp872757lth; Wed, 14 Sep 2022 09:58:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR5iTe/RGTp446Ptm3/z1hQZFtOaZhizRs8tFNPqAJZGncIiFnuA1YgXlk7/GXCOGFyVDHLc X-Received: by 2002:ac8:5755:0:b0:35b:ef17:fe08 with SMTP id 21-20020ac85755000000b0035bef17fe08mr7966965qtx.126.1663174702537; Wed, 14 Sep 2022 09:58:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174702; cv=none; d=google.com; s=arc-20160816; b=QAJCNY0o3YTGbAQinyEwvXCmGh/r4jQAwq8oNzyMnvd6RS0CFbk0wbYQYqCcaTkAwl 3vjyNliibiHa311qhijTeXlloeYWcfqU4d/k1tSLKIf+6o0+4J70BPlTLgrM0M8SupUL wj2/WwMPHsRvY2//waKyIeSCZev17a/Rj5wcD+H+TVBVxPhBwky1pBoYT18PA2Ou+IlO 8bztYHdEZVPe/4bqjwwKKe/6nuW4Hp1FR4LCC5jfB+yR08XzLT8G0JAB0b6wfcVZpoA5 Cj4YkMrl7jGgguYV7f+SLkrwq/2685Gnzq+jFYUjwYUwU4n0peORhBiyODIQg9uZBqK8 wBJw== 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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=dU9ro+KQHtKY7s7rw4Yu7BV/4nKrin9B9CCoiPKdpiqusPl60c2Sk/fgDIlJumM8yi yPbiiV80vPJ4ZkkmMzdau0eccae3CH4lpUy4+RM8mQTXhTryspb+f9TBuGgSM8y1w6PN AxtLhKPwrEupNGoiXYQjmlro9nLBgOEM6NuQLiWVJ3bUrWg5FlWr9JXvVu59YUpgAilo n+wUmZyrIYELgJMr6OEuMzpCHJrbhEbgyZ4ULECSgBpXPKV17OvOMFY6LHBTk3MauNlg pvqr67v2euz5lL/qL+qn/lsxb8pUwPsVmXrNsriAaJiZDnhaBQcX0nCUaPkOI+AB+AMT 6x5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/qhnq9I"; 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 gf10-20020a056214250a00b004ac89567aeasi1535212qvb.558.2022.09.14.09.58.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:58:22 -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="T/qhnq9I"; 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]:35410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYViP-000481-VJ for patch@linaro.org; Wed, 14 Sep 2022 12:58:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUty-0001Nw-Io for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:44851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtw-0003qb-0k for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n17-20020a05600c501100b003a84bf9b68bso11860932wmr.3 for ; Wed, 14 Sep 2022 09:06:11 -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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=T/qhnq9IAQIU9zzdHrWpYmbqIC5N20lYJzyvFd6Omd6DzFZCtP8rb3UeA8FO9gx7hZ CU85z4dEP2aDObqJ156fGRSKQ7ViYQLib170MUNVPuCmFu5biT104oc7/96Xv9FGByo+ 92Q5oQjUxZR8bvrc2NoAztsST2lLPStrHuGGShFuYGCKVUOvbTeBeMXk2nYJLrMq0THn ACOg4q4VwQkwuTJZ43dOH38pbwLhPmkNIEtv+09s7OnUO40yid7/LZxUGgoYsJeFrAYA ysMvAA/veRrx1cWpAQfl9/yj/P2TY4tXJJiCjHO3eIEzAP9Eb608YEHnUIE/TpuVv+bc Sa5g== 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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=eJjbjw4VjwbDtEsM9bPU5dRVmJHVuTFA9j6h1h5KMlQbsxXDr/Bx7KixCTak9LmgTP zZuvXIQg8CYgj4FysTgK23RrgJ31hNQyYdsLiAGdR4oipJ+WpknMlWP1ZF8SMw8vw6hT /mixPtRyvW4NBxBJalReBVoiNsk5fD7ERueOmiE6WOzr0uxwY8h3LP0Wf5Gm3JZTi8NN De//Xu2uDgjOPxQ6clDN3XmOO2aqO+JJ59fqUqZMKIRfq93DM0Pm+CxHk+HYIJKphI6y jgjl/Uez9262cpNwdvHiNTRNvrMQMBR/WvlOaIICkbMH6ENPdcllr6Z+4AZzGSd7OBac D4WQ== X-Gm-Message-State: ACgBeo3wCQkTNb15xr11lw2eFADBl4Xah2hiucNO+Vzapujp3CI4aORi Mlnuq3DOvpfSILNDeEjygisT3g== X-Received: by 2002:a05:600c:35c6:b0:3b4:9a9e:464a with SMTP id r6-20020a05600c35c600b003b49a9e464amr3705425wmq.206.1663171570438; Wed, 14 Sep 2022 09:06:10 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h7-20020a5d5487000000b00228dbf15072sm13747576wrv.62.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 570921FFCE; 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 22/30] tests/docker: flatten debian-riscv64-test-cross Date: Wed, 14 Sep 2022 16:59:42 +0100 Message-Id: <20220914155950.804707-23-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, 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 and update to match the rest of the test cross compile dockerfiles. Signed-off-by: Alex Bennée Message-Id: <20220826172128.353798-17-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - minor reword of commit msg --- .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