From patchwork Sat Oct 28 10:33:03 2023 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: 738938 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301990wrt; Sat, 28 Oct 2023 03:37:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHE7doWA82CGF1gDq7hWkI9tY4gTHcP5owR5YLopRy69DmCPFOozdQS9XAjGZSYNxxc/8F4 X-Received: by 2002:a05:6808:128a:b0:3b2:f270:c689 with SMTP id a10-20020a056808128a00b003b2f270c689mr6229932oiw.23.1698489426043; Sat, 28 Oct 2023 03:37:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489426; cv=none; d=google.com; s=arc-20160816; b=DaIFXyen6xzSK70Ph1Yk+BLeN/nIGMMT4xl19yGU9t6WyPMWw8nEfP9jKDv7V7fSNX pEiHe0aAOT0dq2jSBnaSWgn0GXsXKt4MIUSlU9oXFeuWsAOG6K5iRBxwVQA/5TZOm1Af Dx3gYUmcJd6dQ2GR5j0ELbe9b05InRMUD1sg+BzQ83Sr4G6GLFYEkcIQpruadospOvrj 6Xs05eH86wu4Gv0jT3KhyX0Nsfrj4iyjGLRtS+St0Oosr26YawqkBBi+yMfcoTxd9Uf+ b5jv37M1uH4mqA5H9qkWLSLiHlk39QzDS6xbHZwBPZjeJa2W+mO03tHRkZpY9NY0afHH uQPg== 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=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=V7DFRFpUOL1CyeNVsyMYXkasuoCTbaWbMnjWtG8kv1c8MSzeN8Uh/OdLuMscaZM/1C A969dDziXTFoIHq6HoT9maD8EmpEEy8lc8QyTZHKANtKLQ3QaMZQGQtMYyRoy+0+XFQi HTcyPIs0dViv1gSQExizGI7atvSDbRYBCqTy2cloMKBvz8VP4LXL4QQaHLTehNBobuaN ShoppPenZcfuSHhqUUezEsnH2JQ9BRDQRzj0VFY9vNzVHa0HBXf07/ST1aE25fKeSqt1 PN5/FL7qF6ygdeIAIsKIdyWIVTEqEsjN9W4R05nz469cmrg2n2suqGpgH5ba5tjRDvL2 MxSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mMFO0szo; 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 h5-20020a05620a244500b00773c43e5e5dsi2050432qkn.651.2023.10.28.03.37.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:37:06 -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=mMFO0szo; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdE-0006DF-HY; Sat, 28 Oct 2023 06:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdB-0006Ae-Ft for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003A5-7w for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:25 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so222266f8f.1 for ; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489198; x=1699093998; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; b=mMFO0szoFRqILLC5DZoiJmJY2xc0KJyQwnJ8m/GGM6QLyQ+Rk2z5tFhR/1DuSc5OZs wOFIms432rnS7OATLycbQpfo5Gg7rD4y/84ATAliEegIeVUFV2LmW6VCGSit3BAd3SmB 3ei3AUyIgQAW7a8VkYn02BgUBp5D3VCQMn4dcErd7TatNH/KijpPwNnx6X+3XY/hez8i mKJ+sysgeWD+8o/10cfTVr9Haare4Mwlj3h1begf2sKRUdNq9c7oc5L87/z5DDEpnLR+ 6sMFaHmqnYCt9ctFN25w32AjIuxR99EC3w2MQKyzYuPvuMfR0znZTeD69QpHiqXxSsuV XXvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489198; x=1699093998; 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:message-id:reply-to; bh=VOohqrrDiZJNNE6BJJ+qouc5a6zBuGTEa7edb0jfkyU=; b=M2YQWvAAp9SnqVpQSM/YWqp3vOY/uGe8c/KFLsQFjxsvIDvRjtAms6zq25gb51o0jG Q0HcmbPr6HoRvnpws9i/Plq3pH1/YPpZtomkhfm8wZDELklJ9vEtRSkXJ93A2bj+bOw7 jy3ISlyfbcAnSK4M38QjYP8S7CRKrFvXcLlL0V6CSoF1iRaTEMBjgWuC+z+4jIxYSISg S0y5Smb+NtVOCVP6v5nInsLdhoK+zqJ7+j+zPY7Gj9+yeYjCGzqs9tcK8SxgKIfk8trv JcRnpoviOzHsz2RPd2TQ5VNjeSfcVcJIwHo9eBxyuJs//6CJPJQCMcLA6h5CBbOs1GM+ vhBQ== X-Gm-Message-State: AOJu0YwmRz8tuVPKekbRDZCiDJqvyg/fcqjzR760bUYqPgsHdPeLEwib DUK3/wv5Gi47e4FqJ87J5TMN9A== X-Received: by 2002:a05:6000:11c8:b0:319:72f8:7249 with SMTP id i8-20020a05600011c800b0031972f87249mr3546980wrx.66.1698489198037; Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x14-20020a5d444e000000b0031980294e9fsm3568243wrr.116.2023.10.28.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E12995F7A1; Sat, 28 Oct 2023 11:33:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 09/17] tests/docker: use debian-all-test-cross for mips64 Date: Sat, 28 Oct 2023 11:33:03 +0100 Message-Id: <20231028103311.347104-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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=unavailable 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-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 2 +- .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-mips64-cross.docker | 19 ------------------- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-mips64-cross.docker diff --git a/configure b/configure index c7c811fb02..2bcbf0fc36 100755 --- a/configure +++ b/configure @@ -1327,7 +1327,7 @@ probe_target_compiler() { container_cross_prefix=mips64el-linux-gnuabi64- ;; mips64) - container_image=debian-mips64-cross + container_image=debian-all-test-cross container_cross_prefix=mips64-linux-gnuabi64- ;; nios2) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index cf2fcaa59e..f863a14664 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -40,12 +40,6 @@ hexagon-cross-container: variables: NAME: debian-hexagon-cross -mips64-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-mips64-cross - mips64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f482b1e92d..b4296d3c5e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -123,7 +123,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-loongarch-cross -DOCKER_PARTIAL_IMAGES += debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker deleted file mode 100644 index ba965cf564..0000000000 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -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-mips64-linux-gnuabi64 \ - libc6-dev-mips64-cross -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi