From patchwork Tue Sep 20 17:15:33 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: 607642 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2043357pvb; Tue, 20 Sep 2022 14:50:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+NlKYLXojrGBPP7mqarCCaJmaRkRKNwqqyK+aS0Loj21BWsbIeUipQJLqht5Eyee+9N1h X-Received: by 2002:a05:6214:27e4:b0:4ac:a631:f551 with SMTP id jt4-20020a05621427e400b004aca631f551mr20776354qvb.12.1663710644443; Tue, 20 Sep 2022 14:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710644; cv=none; d=google.com; s=arc-20160816; b=sA3Z4rz7o+h1wHg7w5a4oEICsnVrK0dPlzXI3UWfobmL6PyJQb+wAliUdrMIX4g2Jg ooE1urBZOtROoYSlwfqTDOuqV0SzZz0zCkBfv8nKSUvH8x4DqppJfTihPAymXh6UELWH 1AlER4qOLKVaduaHeUWOvo4wricvobmf0QnTu8zA4Ln8WZ+g8WodqpM4Qge313CIOAzo Oc8thJZyMnoK48rpWy31tlScJ5413ZWJOwPTRxTxoL1uyf2tkUdIPTcMggd3vLAp5WHJ ChBHyCMpl1/Iuok1bBC/WfDFxpfie6IwnfP7HdD0jeaDAdudGRKR6AffueNs4xIjJVzG iM4w== 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=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=Mbksl7g/T0AGDVgG+yvaJIXr3qLmGRBpdkzUfQQH1wVPpfHfrNa0Bd5eTmGFwi+06w w4ID55PH3NzKdTe3XQ/fJXv432qD++W0DK01gTzkxqxwq55/lpv/E/E+M7gBMJIXD6cb vvHuenLImrRVNjBXiDIU0MXGeuM2Ipn3rIbRHArns28oDsBiIYGod02QVvsFvcpTCAh0 9sm00Rq2/ghbzwUGC9WVGV6FwRydgbJExmcE+D21KItdET9NFR2rmgVc02XXpnxBF13p MhPeY9e7yn0YSdTJ8GTDMjePH7rO6oXZK7jxqmN7573ptYip6SoAt2CH2p32XaNF6dtO /fbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r9AJjD2a; 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 fg15-20020a05622a580f00b0035baa4feb09si489847qtb.152.2022.09.20.14.50.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:50:44 -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=r9AJjD2a; 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]:49028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal8d-0004my-V1 for patch@linaro.org; Tue, 20 Sep 2022 17:50:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzd-000631-BR for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:09 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:42968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagza-0001pC-4p for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:09 -0400 Received: by mail-ej1-x630.google.com with SMTP id sb3so7822066ejb.9 for ; Tue, 20 Sep 2022 10:25:05 -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=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=r9AJjD2asohZgNfHL2ukcKfWs8j/jbo7+ws5BKCgcCi54b7Z2hfr+dtvNQZm64a6al aaS1aFrxove6+enppG70q3r6NsuA3c+f2dn7ONA2zJG7qWc2a5sdNJJdDIIsTG4ohEgG Q3InHztC362WhD+OR/I1t9E8IpKfEAsS4jyCO387t75KYAG4ogywVpYBUslL+lbUXA51 UGClRBdl2cSOrr7kH+S4Prw7GMfwowEvRTtFuW8I8xRUM9LtodsjOmqiX35To0jGNfcC MwiSpadOjSgZl3FDKk3aKFcTNVa40bGUvTfQyhnDR9jRnGFwczbbQJ+mWmEHXXMd5iVA yw4g== 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=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=uf85dewrq6RwSC0uC4jNfW2XzsRKkJiFowf4+48lHktR3wf/TwI3k+YTHmVdDkYMPe rEeNfFnxm2WnNRHFt9kXuf+Yr+EVnyg0QwRuhu+mm8qPKIWNRi8ycz8bPaGHurnOgZVi 34BQLbGOa2D9Xl9pyTVTeuM7kKYjbX+7JVp86zpAQxPtnEIqcHko5nS02r0jv+lnWMSO rszoTR+t8clHaVDpCIIbZBKyXwSI5TV9gHvAhmAWx1Q7l47G9w8dKaDBLyzssKMIW3FM tFSR92ZbR9D7qymTD0Pfuq+6JGPdHe6/8/AqyPpPNgEObKM66rhNTGE91SsgywcDIxBp Uz/A== X-Gm-Message-State: ACrzQf3QDXmrg+HiwWgDX/3OxOuK5YFMsMZefftT32rv9qkEBataBoPb I381k8UhKBCtYPPyNAqeliiqDQ== X-Received: by 2002:a17:906:7944:b0:73c:838:ac3d with SMTP id l4-20020a170906794400b0073c0838ac3dmr17821921ejo.242.1663694705302; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a10-20020a50ff0a000000b00454546561cfsm152307edu.82.2022.09.20.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF0991FFD5; 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?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 30/30] tests/docker: remove the Debian base images Date: Tue, 20 Sep 2022 18:15:33 +0100 Message-Id: <20220920171533.1098094-31-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::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.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" We no longer use these in any of our images. Clean-up the remaining comments and documentation that reference them and remove from the build. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-31-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index f35f117d95..aea5b42356 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -375,7 +375,7 @@ locally by using the ``NOCACHE`` build option: .. code:: - make docker-image-debian10 NOCACHE=1 + make docker-image-debian-arm64-cross NOCACHE=1 Images ~~~~~~ diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml index e8dd1f476a..08f8450fa1 100644 --- a/.gitlab-ci.d/container-core.yml +++ b/.gitlab-ci.d/container-core.yml @@ -10,8 +10,3 @@ amd64-fedora-container: extends: .container_job_template variables: NAME: fedora - -amd64-debian10-container: - extends: .container_job_template - variables: - NAME: debian10 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index be34cbc7ba..96d2a3b58b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -7,11 +7,6 @@ amd64-alpine-container: variables: NAME: alpine -amd64-debian11-container: - extends: .container_job_template - variables: - NAME: debian11 - amd64-debian-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a3174346da..270e99786e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -69,9 +69,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) -# Enforce dependencies for composite images -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 +# Special case cross-compiling x86_64 on non-x86_64 systems. ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else @@ -89,10 +87,6 @@ endif # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= -# base images should not add a local user -docker-image-debian10: NOUSER=1 -docker-image-debian11: NOUSER=1 - # alpine has no adduser docker-image-alpine: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker deleted file mode 100644 index 03be923066..0000000000 --- a/tests/docker/dockerfiles/debian10.docker +++ /dev/null @@ -1,38 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian cross compiler targets to build distro -# with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:buster-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bc \ - build-essential \ - ca-certificates \ - ccache \ - clang \ - dbus \ - gdb-multiarch \ - gettext \ - git \ - libffi-dev \ - libncurses5-dev \ - ninja-build \ - pkg-config \ - psmisc \ - python3 \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/debian11.docker deleted file mode 100644 index febf884f8f..0000000000 --- a/tests/docker/dockerfiles/debian11.docker +++ /dev/null @@ -1,18 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target uses the current development version of Debian as -# a base for cross compilers for building test binaries. We won't -# attempt to build QEMU on it yet given it is still in development. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:bullseye-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata