From patchwork Sun Oct 29 14:50:25 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: 739054 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp742992wrt; Sun, 29 Oct 2023 07:53:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYvjxZIxIARi/UXWvDmViMKjwiTmscngFsrHaBQWUOaC8xh1VGNPML6UhoKnv6xkwJRb2G X-Received: by 2002:a05:622a:40d:b0:419:7e82:9190 with SMTP id n13-20020a05622a040d00b004197e829190mr10399304qtx.31.1698591191856; Sun, 29 Oct 2023 07:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591191; cv=none; d=google.com; s=arc-20160816; b=O3bGIeTMZtrCFVuBq81HkkRBvVQFP+FMe4fpW/AcIGvidB2GJAdivT5AkSZz1K+sL3 8Um7UGLrv2Se7R2lzeUi9vQVwV5HfN39OGCuXyyHn1SXgu1xGko4XWzRsmAucickHzpm zDMDL2rRSZLP2uXu6079ej9QBhhDgq9T+6rn4kBw4QTWk3RHdTpIOdPoxCpqrm3W+p65 zZ8hxT1d2BopAYXqqBdT6MxgSytUjA/BYRjFt8UAq0Mp2oDRjWfIqqqTmIJmuG+o3cyT FwiSbygNAhgmM7ZrE8SGaUovd4oHxDhsDWncZo7eBpBsA/CqSX1IjU3lvEDRjmp59MGi GIZQ== 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=ifnDTC7wfj+PooeFzDEu5s54tBM3Ed0ClHgMpWiJrQ0=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=BcLTZZq6fl8IQ4ddMobtrIxX65Idx7OBeQtN3TuoxSR/gyXlDRet8Tsb7yc6UYvFUq vMkfIoxa1w0sgQagcR9rtV5x0fvOBOVD3kQFUq5fEorL10Hth3ElWaK/15+AkR0t5KMT yY9+eSkH4+KXEhR1IVWHY+yPXc+wEYFDtee2mjK0Isq2C6SA/JhhEvx3H6l7rr6ZSgJ2 zjgYfZiotxjRkBgHzZciyYWmocA3xh4T/YEQE4dsV1h0NNdzBUWU3Q7VXwlIwB8MamuN 7N0hcg+0u2vSALtSuYpSeZh5EGE4xf5duKJFR+2ZUK97oULreolGHHOxPMJu79cc0ok0 nNOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jwvzdYbm; 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 j5-20020ac85c45000000b0041975501022si4164937qtj.108.2023.10.29.07.53.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:53:11 -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=jwvzdYbm; 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 1qx77p-0007Xt-7u; Sun, 29 Oct 2023 10:50:49 -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 1qx77n-0007Uw-Dc for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:47 -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 1qx77i-00057s-6U for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:47 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32f78dcf036so693506f8f.0 for ; Sun, 29 Oct 2023 07:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591041; x=1699195841; 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=ifnDTC7wfj+PooeFzDEu5s54tBM3Ed0ClHgMpWiJrQ0=; b=jwvzdYbm1cldryOPHKujyxNQmRGVgiv0x3HrWCeuoAeKZ83IWuSKuA3ResSO8j/W7k ECcoHQbCGPe431F4TVAU6/+n+moXw6HSRWL1j8dC04De2fsWhKxg1ED/v01A+liUvUjC mIelt+j4WuOA09SwznZ5O35cymNMgqqxQ4ijQ8HVO+aVxjlrzBggoOtBFmgzZnchCwvw NvjMHCsHNXQCg5k6gsK3xxeKEu+VQBi5eRkmMEpuhUpy60a2cekEUp5rOoBHm2BxrEPh Rf6xSA45Q4+e25j3WB1/hNQObQYV43JvO7zZR1/h+xyh+bbRSLWAFDz1UDUwcWebqJaE Hebw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591041; x=1699195841; 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=ifnDTC7wfj+PooeFzDEu5s54tBM3Ed0ClHgMpWiJrQ0=; b=KcsWiTa8021Wv882Cf6IXiOO19o4C6jHqsntImeNEaTOftN61SC9IIoxhQVute+DP3 y79GPN8AKLkrCROfOfVZL9VhVESldDz5ZRkuT8t1YRVzMTXxc/ifMl0zArbIEbJcyJ1c zb6LwtqJJrSgbFwk0S5jh8YXmGVmjIwnjJ/+07Soc6EqE7tofBNzYhBM1hrp80kJ4BKu 2RH9VcTedjw37AZ/hLaD/VB3i7SJNBPGtXSl22BwOBitdWLXjqT5xVs3KiGJvKif+lvN YwQ36Di4WJj3f3CYGGjbR8JT8/fkZp7Esj6bOjwX5GrANrCCOeZkXEs/CQATWS3HtGWx gitg== X-Gm-Message-State: AOJu0YxArjy9nezxaLueAoNC1AteJKOkKlgLFiM8oWACztE1r6hv9Dzn UQTasvEZurtsSaxzfW2poLRxxw== X-Received: by 2002:a05:6000:1004:b0:32d:a4d0:1364 with SMTP id a4-20020a056000100400b0032da4d01364mr10421883wrx.29.1698591040774; Sun, 29 Oct 2023 07:50:40 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w16-20020adfcd10000000b0032da75af3easm6056015wrm.80.2023.10.29.07.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 295335F7A1; Sun, 29 Oct 2023 14:50:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Wainer dos Santos Moschetta , Brad Smith , Aleksandar Rikalo , Kyle Evans , Aurelien Jarno , Jiaxun Yang , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Warner Losh , "Edgar E. Iglesias" , Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Brian Cain , Alexandre Iooss Subject: [PATCH v2 11/19] tests/docker: use debian-all-test-cross for mips64 Date: Sun, 29 Oct 2023 14:50:25 +0000 Message-Id: <20231029145033.592566-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029145033.592566-1-alex.bennee@linaro.org> References: <20231029145033.592566-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=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-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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231028103311.347104-10-alex.bennee@linaro.org> --- 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 d42d89b26e..df5eb3ccb6 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,12 +46,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-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 fb93eca537..5831744a39 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -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