From patchwork Fri Aug 26 17:21:12 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: 600301 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp561602mae; Fri, 26 Aug 2022 10:37:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR6cdy1HvAC3Kxy3VLLh39FE3f1W0U6EvZLImkglLvNyITc0vYjpFMNDEdJselmwmFZTkt44 X-Received: by 2002:a05:622a:c7:b0:343:2e72:8416 with SMTP id p7-20020a05622a00c700b003432e728416mr750018qtw.92.1661535425274; Fri, 26 Aug 2022 10:37:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661535425; cv=none; d=google.com; s=arc-20160816; b=QuaZlpzSfeVwE68RKn8XauNQaJo1M+L23XJwixsvFbuC497RcNWf+Yf/7bCBekrAdp SNkaMiRwioiWhxmbJ22mGG2vqhYRjbJju2a6nSC7z3PtlvLv3Y/azMzrZyzS32wzEAuj 45uIKJyUf4senMYMt5wl6x2x7pWQi2UzQnYYRRyWiZ2vKDq2uP8ZYKNg3HPkblsAH2tG 1ivvLCiy1AlKAJj+Rov6N6fIjBm4kRC1REKBHb5ZSFlhZ8WXV6Ry6yZQxzL23+hpfbkV wc016MEH9XWMhK1kGlojFLD6cvwrvFYra/mJ/yzMXWMB4Xoif3x/OpTdL6tbJfCLDErx OugA== 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=fYgRCdRIiVNTnbdRi8F/piAWM2mBMcNmROHYK2H+FtA=; b=IJRkZpAsAfZnviBsfHjgJ4N30uGNyTijJTFmiOiKxYyrWy0WMv32YaH9g7c5NjUO0+ D3Ieb9X17+Ucaj4MC/HKOEfekrEdWjbJQIbgp4DSivXl8HNEwsZ/H7OXPYVPcUv97tL/ mtr9b/N7anK96xSlpAwYBgqVlZp+X6pzlSop6gstJCRy5l5YtTTKCXl6TTj8jQ5yj/qa Dg4qNKuaZWUblOu/PWnPwXPcSClIObAuBx2s8Yl7cYbJRWb6x5lcZkTEktp1EIe+V05n XXUw4ftuShlYRE1zz+iXiV7rMypB2KRwZ5m/d7c4F+9dVO9Ps3sdWqOBIPJRW3JmsJUW mx5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KLXpPJNP; 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 f5-20020ac86ec5000000b00342f5bd3802si147816qtv.707.2022.08.26.10.37.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:37:05 -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=KLXpPJNP; 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]:56076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRdGS-0000oC-MH for patch@linaro.org; Fri, 26 Aug 2022 13:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd1a-0004Iq-HA for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:42 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd1Y-0002Lh-Ew for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:42 -0400 Received: by mail-wr1-x432.google.com with SMTP id m16so2545101wru.9 for ; Fri, 26 Aug 2022 10:21:40 -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=fYgRCdRIiVNTnbdRi8F/piAWM2mBMcNmROHYK2H+FtA=; b=KLXpPJNPXgwVShqPqSUIKvEqxRQomykc2HVMNCGw5VV9LDb9Q0O1Oxu3tmfnwTCTsb MxVJDcmR0Url/9A2cO7siW1ayEHEjHly6EG/GbooNU01CYPZnaRRsvjThUUh6c5lgT2Y qbbQ67xYvhT2nVkWGe+PkpflbK8Goc4VOvzmk35QoAuhOoyhTwh9oowRz5VKUxnQLYE2 M0dmM1jhWviS79+tHxAX74ctOkRh1K/0PU4Y+gwPW+c+oqiRhDS98RSGLlWRcV3IEduW RVoZtKxHIWq+Miak6R8XlWFDeFWMBT/QtOorbdYRuOHZ0DODw8iIoq6uINi06QqMzmnl eNyA== 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=fYgRCdRIiVNTnbdRi8F/piAWM2mBMcNmROHYK2H+FtA=; b=cXaxPNcZyRhROBSpoFbpTZzjHQn67vOwG9D9NOqHwQoYeveryajoDsGKGSmDxWvSMf mEB0BQ9DgYo0w2bGkSxdxviYe7aRjrShwQ+m0taondqofXTTXFJDGX73rX+2WEyHx4uT N50HyYVm9S3wqGsJh/2p7L8AMJNIpowkHWyOeHMY+4oD4NKoVS9lBqaJdUEdznspnPrT ck1VCULiRr98x2diEhFQaXyRx8V6lZ3FclLiPwIAXfGI3uUe73fCisYCarG6guxDHM1v 3uS5ZXR0JIFYqvEc8/WpbX49pupfkeOTVkZfFDOofITN+ZPtxmOhV+THZVOxbb+Wmc9B tWJA== X-Gm-Message-State: ACgBeo2TrIcapKFftojMsav58HzSawqTX9d/DVRVNEgKTmW/zq5/ygRf 1njxL2RIpksGDxqY+kKmTp6ECQ== X-Received: by 2002:a05:6000:1149:b0:225:29d4:67eb with SMTP id d9-20020a056000114900b0022529d467ebmr393495wrx.254.1661534498862; Fri, 26 Aug 2022 10:21:38 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t8-20020adfdc08000000b002258413c310sm237161wri.88.2022.08.26.10.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:21:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B9BA1FFC1; Fri, 26 Aug 2022 18:21:29 +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 09/25] tests/docker: flatten debian-powerpc-test-cross Date: Fri, 26 Aug 2022 18:21:12 +0100 Message-Id: <20220826172128.353798-10-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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 Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-powerpc-test-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 db0ea15d0d..67bbf19a27 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -102,7 +102,6 @@ mipsel-debian-cross-container: powerpc-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-powerpc-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8828b6b8fa..e034eca3af 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -137,7 +137,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-powerpc-test-cross: docker-image-debian11 docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker index 36b336f709..d6b2909cc4 100644 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -1,13 +1,15 @@ # # Docker powerpc/ppc64/ppc64le cross-compiler target # -# This docker target builds on the debian Bullseye base image. +# 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-powerpc-linux-gnu \ libc6-dev-powerpc-cross \ gcc-10-powerpc64-linux-gnu \