From patchwork Fri Aug 26 17:21:27 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: 600307 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp566046mae; Fri, 26 Aug 2022 10:46:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR4rs60op8NVDigZ1HqhzN9JkJbZYZrOBClGR0McP8jQTrCJfgEtzrzH/MMbI4FSAqGmaPwF X-Received: by 2002:a05:620a:8d0:b0:6bb:72f2:406b with SMTP id z16-20020a05620a08d000b006bb72f2406bmr588405qkz.283.1661536002118; Fri, 26 Aug 2022 10:46:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661536002; cv=none; d=google.com; s=arc-20160816; b=R+XU5jg82enZQMdRM6OxdcdVjx9X/cjw3Jbr+1H4dmoxn4RHchOFE/JyyMyjYCgT8o U43RF3T1/MBO+hbeiNOTRZwVcka8VtomiRudyszRtUeNOYYPz66uqJW8bn0S7sgsu4Pk 7cPwHYcoMgY383qgNOOPuEAlm1968qnEAzB3YHmUXtHFeX6PkG9yc3nGSTOY6MBtH5k1 PTQ+wpXlOGE1bGZUIYKCqLJ24ryvk+RsGbtXPlJ8uwA3Cfz8zbbm9+tJkoloA0u4hLob bbe7v63x6B5cfwBP6wvFXz92uBDMCy5JBOYeUVpDQMdsS1inewH1ZM3Bwahuy/vfrJna W6PQ== 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=EyCV6txuMslnHOOFdGI8L3TD9YEN0NDMa6qM6xQA1ts=; b=olEUD1lF0ShZo0yZ97AyDtAsKzBMyx4YiCr4eWRPyq/o4MnjIqnqGehE9Q0da/PVes cPmyGBiw3ESayX+ArytW8rscwPKpgtNvCQSRN2dRTNnh55/iEawBpzN6Due/Kv/3GkLE arHQNGxXbQVf+m17mzhq1wrM0S9Bjo51hRZM7/Ge7DcfJvajTh5bMaTp+JwUX4cC/2IX qtooeUnEPttG9PbsHan2nctsObkVAhG0JtjYdnuQsdBnBO41pnUu+HQK1/5oblxfyVeD ESTrIJ1Inq9z+vnnm7NwxGmjcyEsKzlI3MWabiI5NT1iEFopsNF6NP5I4xP7wt92gMAD BR4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YxUbYIf+; 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 f4-20020ac81344000000b0034454bb5f33si161639qtj.633.2022.08.26.10.46.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:46:42 -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=YxUbYIf+; 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]:51042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRdPl-0004fY-Mg for patch@linaro.org; Fri, 26 Aug 2022 13:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd9x-0005h7-Ti for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:22 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:38560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd9v-0003gw-QE for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:21 -0400 Received: by mail-wm1-x334.google.com with SMTP id n23-20020a7bc5d7000000b003a62f19b453so4774066wmk.3 for ; Fri, 26 Aug 2022 10:30:19 -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=EyCV6txuMslnHOOFdGI8L3TD9YEN0NDMa6qM6xQA1ts=; b=YxUbYIf+O3/aJnnZ4oGKrls7edxW64+If4Pgt2FPLNhJEcWqTSiGv5WPDRBg9xqhd+ Lgt+BxkzNecrXGc/KVUEKgy9IxYzxeBbUNwBbJdy91CXQC/BdK+P2INPLqzZgTvjtQlU /uJbdRVdNnYS1bPxcXhFSnnreU2KKA/awA4bPawsx/BHLTr4G4e7C2sUpsHp0l74XOkF eNmX3PAZ6/FP490r91jejmKaXzbcVOgQ0vMzT4a9RqN2orI41XGOMUKU7iXC+HtUUowJ NDX+SIWJsjX0f60IJAri1mfaL4Ngl4Vvnfsr3y1wE6twXmiIr03C6DxMjkttgZdE3zsj +TcQ== 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=EyCV6txuMslnHOOFdGI8L3TD9YEN0NDMa6qM6xQA1ts=; b=hNc3V9TXIAzENLhGVE8ktOGZkLGGegzfB82odyveNHOotUzTCat+DjBoQUsPthj0Ey J1gPKUeHAz1F9JOh4uPg5+mYEuEc6KLk6m2w1xJUPxcHdr4MNT/m/C/b7Jy60eORPyj0 sOA/lR3jMHrqdUP+ceg5xISTXF62eIpgAGtluhdj+ZqH1lmKLDzhnjZu7SNrbeIz4qU1 mWoZYI5mFc+/s/ZqR1CMcrfY84NnFu/tVRiQSmB+Nr+B89sL6x7se4rtdK30Ey/AxBNu HCDNOQRX9pIyS4HkiugpbiR3z2J8W43qI+IZm6Dk56/Mo8h4hlM5g8CrNcPm6ATd+66O OA1A== X-Gm-Message-State: ACgBeo2MF6nxLMiyBnFjbzphSrpLekO7u2n0YC6QSqyKJNSfArKmkZPa mGqYI0GDEXZzmqXvq4RXcpyNNw== X-Received: by 2002:a05:600c:3846:b0:3a6:5294:d0a9 with SMTP id s6-20020a05600c384600b003a65294d0a9mr368239wmr.28.1661535018213; Fri, 26 Aug 2022 10:30:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n3-20020a05600c3b8300b003a319b67f64sm18331339wms.0.2022.08.26.10.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:30:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D85551FFCE; 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 24/25] tests/docker: remove the Debian base images Date: Fri, 26 Aug 2022 18:21:27 +0100 Message-Id: <20220826172128.353798-25-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::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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" 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 --- docs/devel/testing.rst | 2 +- .gitlab-ci.d/container-core.yml | 5 ---- .gitlab-ci.d/containers.yml | 5 ---- tests/docker/Makefile.include | 8 +---- tests/docker/dockerfiles/debian10.docker | 38 ------------------------ tests/docker/dockerfiles/debian11.docker | 18 ----------- 6 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian10.docker delete mode 100644 tests/docker/dockerfiles/debian11.docker diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 3f6ebd5073..8d0b272352 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