From patchwork Tue Sep 20 17:15:25 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: 607633 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2032305pvb; Tue, 20 Sep 2022 14:19:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5hJqHOq+ipJ/aTJnMYUjWYcjbgtW9Ge0qOwrqVoSpFWCeq4ugmMvRoK2e+wueZt35cFyhr X-Received: by 2002:a0c:f388:0:b0:4ac:ae7e:b70c with SMTP id i8-20020a0cf388000000b004acae7eb70cmr20674700qvk.43.1663708783374; Tue, 20 Sep 2022 14:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663708783; cv=none; d=google.com; s=arc-20160816; b=oButg6XVXrE59j92g3m739U9KiAc+m0QTLQYT2jy3+5690gj3nvfoY0kgwN/I5qUow mS3qoPouZtLUTzyZuGAqYYo6915oI/ta/UsDhH3+1rKMo/lO1HBzRsHYvyWOIb97jyed pQmIcblcwYPu3TJXH/ckrh/lmg3YDdRYGRauCe9ufCT+KKOwlh43ooXz6zcujtvx5vLE B1/GEe3UvrYUKOTFWl7hfnSaXZ1zRoYxyoosPnlnNmgsqHUF1UL2w4QC3ZZJegaSKJrt qzC1ytC1wsMTD3PljDz6pBwYjx22Sn3fxl3tfv1RbjU4zkKeFOMiwEAcpVKEjVNwKlVE 8Fqw== 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=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=L9OiwOqPFcWHo/3l8WXqoPzqVQpPpp2P0+Z6khMo8xFUU382Gm7+Yq/5g04P+C2MeA 3iBM2fHxSgymjHVdiVEoOmsis1+9ujVbvmjAPOZmUw2F+LIsHo0+1AdtxHBX5UJCpuQo BgSzeFC8GNeTK8TdzQY0klfJrFRPdhfLzClYhQMkOwWX7QpiYPjjzCEVoC4IsCmtsnXp OB/DhlTbXIw43YjRmJsCOfbCrEmVKtUTuG9S2haeTg3dhnrzGC0yAaG7ciXhKhXRM2VV jHQRCk+KjDTrczmJgybZdzCcWt6CC+CD623yaIUiMUWEDVwcxRNr/Nr+k2lk/Y1Bihqn zYPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YJjuOWwD; 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 im7-20020a056214246700b004aaa72ac30fsi570931qvb.2.2022.09.20.14.19.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:19:43 -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=YJjuOWwD; 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]:48846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakec-0007xM-UY for patch@linaro.org; Tue, 20 Sep 2022 17:19:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzS-0005gu-Ik for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:37610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzQ-0001nm-Mq for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: by mail-ed1-x52b.google.com with SMTP id a41so4899330edf.4 for ; Tue, 20 Sep 2022 10:24:56 -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=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=YJjuOWwDDQ6k7QRAuuRG1uB69ZEGzgZe9RATwp/soqaGfZ5Rv63XmF0hv1cnlpdoNZ QdLiFJf9OUQSuqxku6wSb8T31hOy14dtWdYhM3df2dZqyi224zmpmSpqEEFTZAOBUsd9 AnLA5bcMaAv8zBuIrsygd+8dckSMMg7C6Of2sVw3z1LTqIK89z/TPL/B21nAmM/ty7TF UbH2dY/+jQMhGaEM6Qx+INNzy/sog/xy3qKFFu6SzwY9PGdFOVEuYOFFQ2y/7ihJPq06 tIh2FcgxWLMkr4po1k52CMq/Pk5ZnVM/kYZ6La3kDw2uiMIqMKQlge2vYqgl6NWZVp23 KbWg== 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=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=RJ5zJNlUSbLUhggLqbdsxyKeBEhHcJ9aT5moSC8sCo8jRXtiP4NSzblitbHzKN3N8K ps2j0H5tpA2r2nOAJLBzSIDdHHYJ76VqTmfgykcmE2BkKlUbDCwy/nnPiwqFTSmtZlBu xe+eoMvSIrwCXEN9t8+RjLYnZB6U/HMD2bkjOXlUhJuBm2PnRTVH2q98B4KcNfhimhKL wR8ZztPvMmUxYa3JcG117Psok2ksdz4Bq3lXMwznd8qFzo/gBKZtzWWQkk6U0vg+N+J8 cT9/rBzP7cFqQsH/EGczXDA91fo3jX4r3VlXrgA5NNy98bFanUCQvJLNk4PpKU6r/Zto AxaQ== X-Gm-Message-State: ACrzQf07zE/Y2VErJ5ioscfLNI35/cemy3CaE03o6X/xCu5JGvFXjZl8 13x/MLdhkFD1c6IlyfLYJVDV8w== X-Received: by 2002:a05:6402:3213:b0:453:4426:a97b with SMTP id g19-20020a056402321300b004534426a97bmr19988612eda.8.1663694694801; Tue, 20 Sep 2022 10:24:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d5-20020aa7c1c5000000b004518ee90b4dsm239332edp.1.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0E1C41FFCD; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross Date: Tue, 20 Sep 2022 18:15:25 +0100 Message-Id: <20220920171533.1098094-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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 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 Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-23-alex.bennee@linaro.org> 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