From patchwork Sun Oct 29 14:50:20 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: 739049 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp742794wrt; Sun, 29 Oct 2023 07:52:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGoGZ/jdkDEy9vdpKXdZ1YFk1qWqiLzjGx3DheZTprddZxcIYFHUelpLODGGKk0jNvEWRYC X-Received: by 2002:a05:690c:5:b0:589:b3c6:95ff with SMTP id bc5-20020a05690c000500b00589b3c695ffmr8831910ywb.36.1698591147006; Sun, 29 Oct 2023 07:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591146; cv=none; d=google.com; s=arc-20160816; b=Xng9QSgtGFCrAlkhRcQq+S4t1taP6jz5ImlKa/Nhte/zYdsugzIXtiY7/iWUK2DfZ7 gzD5LxO8Ia47bQMRZO0RRjypJhDS9ixofU3rI+IKwyftzIo4f41ogG7AZmnQLaxDmxQc QdHNuJEmPr0fWnAaDkf1AZePJzQ48HCMpcVZYwDo/5B44svYpZ73mTZfh+PmyFM5Q+3K /MKyo62eJc8o84VOZMbfsV7zefybDngaKuFn0LvenCqEhORChr2yzCwFTbXDkoXVdDC3 qK4cEMWTWjjMrRQwpF2EZTuArNggW2M8F/6utQ1daIClJyyODhvp/VMeieoIxbUyxJ1l jAcg== 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=SNNScLl2EnYnhjzXY3DyEkkpccU8fcT69NItdWwEwog=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=Y43qeHtQ+VrSrgYVkFljzpC4QejOMrCTNz+3Kq9+PfuitVUIfhZAFPtNhs1C9PLmxl lvTREJovDxAkt+PoSW2nxGCp6O7oVe2FkLIc1GSEph8pOTjlyg8XqBQywaqfGZUJa6ee YrpDXhkNqk92M34G74J1FwJgr0zmBcLBJIQRjlataew6g0QG8m6YM2HuRIUccf7JdYCs 52j7A57jG7xla9GJcZ9gzqqIn5ZWS+8lebIwGL4CVz26+vduT1iwD08dPv7HXHgb+dw1 ZYB2Wok533GmGw3yr3H7ASHXAUGqicWQFKSZ9eQU/wqPbBzt6tIaLyaYebIqP5yW0CO1 FJ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AzDbS9Vx; 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 ey4-20020a0562140b6400b00670a1632cadsi3157418qvb.286.2023.10.29.07.52.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:52:26 -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=AzDbS9Vx; 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 1qx77o-0007WI-D9; Sun, 29 Oct 2023 10:50:48 -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 1qx77l-0007Se-FH for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:45 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77g-000570-Fz for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-409299277bbso21437695e9.2 for ; Sun, 29 Oct 2023 07:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591039; x=1699195839; 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=SNNScLl2EnYnhjzXY3DyEkkpccU8fcT69NItdWwEwog=; b=AzDbS9VxqZqpXvb5tRQHy2HOshdlQKKqsugc4uX60zbkP51g2lv95bFQixWKtu7gfc nDTbX6BJLZL5jjHbwXRYheM/eK1i/Bufs4ayhuVnE1DnLn1zY0KG6mCh28Tqcimb1+yL titTozq+Ylfy1Rfg+AwEm11VGD3ek042ja6T/Fs7lRQBkOeqTOmTB9Zb7xnMtTS8qQPW fvWBaBeW+/Nr+0wNRVQ8q5/QTf567y/cM0BUBeRPfz7liMaIpk/grA1oHYX92dZWtAFC CFkH4CKYTN/rnFtxkC3BBt45V/nYFFwdt96ZciniTlhbPNdxJyhhaKurW2KCCQwW25Xx /9TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591039; x=1699195839; 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=SNNScLl2EnYnhjzXY3DyEkkpccU8fcT69NItdWwEwog=; b=fqhxes+N1NAX6NKqNAYnDW49YU0UfUoYET6u9pHgedIQXJMFzHfSLFf1YhocW4TlnN EDIoPNeEp1dtrtGSih045NTkk0xWX463eGQFSMAnG+X3ZDtVnu4GlGWXZx/kmdkZWmxx W2qDpzm5LWQR4zRw59GEHg7AVE01Njuo74BKF6Kr8hJOqq4f2QglgwxCYBrFqJEITpNE pz5IfcSPUfwkFHhlTpIATL3DHJgfigrLJPHMpajih1ccIHlgDHzkRtEjVyMOi2I/kQJg By8UzMDJN0pUo/j+C/dlyPuwZZDA95RbeA4qUvdD2KW7lFTb9YKcOygmRH+QhGXo8Fat ucBQ== X-Gm-Message-State: AOJu0Yy7eYofnccH07Dt5k9bdNXQeeYkkcsjFJKTHlcXmKRpbFwJ/lqP x6eAb8SdRYrDn0PzbmVHC2sPOQ== X-Received: by 2002:a05:600c:3c9a:b0:408:41b4:7fe0 with SMTP id bg26-20020a05600c3c9a00b0040841b47fe0mr6402277wmb.6.1698591039111; Sun, 29 Oct 2023 07:50:39 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o42-20020a05600c33aa00b0040303a9965asm10141054wmp.40.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 9CA7E5F839; Sun, 29 Oct 2023 14:50:34 +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 06/19] tests/docker: use debian-legacy-test-cross for alpha Date: Sun, 29 Oct 2023 14:50:20 +0000 Message-Id: <20231029145033.592566-7-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::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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-5-alex.bennee@linaro.org> --- configure | 5 +++++ .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 1 - .../dockerfiles/debian-alpha-cross.docker | 19 ------------------- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-alpha-cross.docker diff --git a/configure b/configure index b4ea78c77d..c8d0d4f7cb 100755 --- a/configure +++ b/configure @@ -1281,6 +1281,11 @@ probe_target_compiler() { container_cross_prefix=aarch64-linux-gnu- container_cross_cc=${container_cross_prefix}gcc ;; + alpha) + container_image=debian-legacy-test-cross + container_cross_prefix=alpha-linux-gnu- + container_cross_cc=${container_cross_prefix}gcc + ;; arm) # We don't have any bigendian build tools so we only use this for ARM container_image=debian-armhf-cross diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index d200f3e00d..0de1929e74 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,9 +1,3 @@ -alpha-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-alpha-cross - amd64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 5635d1537f..8270bdff6c 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-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker deleted file mode 100644 index 7fa7bf1bde..0000000000 --- a/tests/docker/dockerfiles/debian-alpha-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-alpha-linux-gnu \ - libc6.1-dev-alpha-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