From patchwork Sat Oct 28 10:33:05 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: 738936 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301874wrt; Sat, 28 Oct 2023 03:36:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHlOkWr8ujhZJ3sOcApq4z8AZpAlXESW/o2l5XaanTabVYmkgZZvcn4mKA34UgrwEBN1AP X-Received: by 2002:ac8:57d3:0:b0:41c:bb5e:ba1b with SMTP id w19-20020ac857d3000000b0041cbb5eba1bmr6311647qta.38.1698489398761; Sat, 28 Oct 2023 03:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489398; cv=none; d=google.com; s=arc-20160816; b=fuXu0fbLHeyTKWYbgy0ATz300ZV/+ON3eG1W6Bw8Ob5OOls7GjyOzbY3j+P2v9cBZZ 63ESt9Ffl26UNNf6OAzAJOFblPWFFWPLZV3/j2P5uWSZjCHGLcaZJgoA8ah9v6u/AUZn zKEwEzn+ffbk2PZuFXatZgNYPy54SF4GVXP8oVj3ElCWppmAEvKqNU3pS2IqH58EbxNj 7ssr9G7/wbuDnp4IrZtdaf3aiJDsMzlRagkURtOxRxOnClIbkyqtjFeWDgwML9Wau0ny Y8HSsAPbwh9ABBzYtgl4LQi5z+9LPpwHgRfLdalnTlbTJ1Esb/jbeJNdOa5k/4xco9qc scCQ== 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=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=LWll0sOj6PuM1BxacNgRk0kBnL4onzXtJbHZS4JhsXlebQcXIFL/5T4iE88haC0OeY yeSzztylFU01R3qkCBSdqyoYvgY8eXkgOx7T5vQ7QiFPPct7WPs2DRyCk14fOHrC9Hp8 57oAdLlNiKnyL576Ld5wKJBx6RWJPmZ8cbaywKLSSDrpokv/jQ0SVH8wq+U5V/E9T9BU AjAdclTNLCGwP2Nkg7vZotA5My5v/n4gRgitMzTl4XIz5L0ZDFsbYwknZiPImqHYFFxZ LOC7l0nc2wK/b0+ZPEjnA8xlZ2bsNFKXe/4GtZHAUdMzVcHrtSOAZk4F63RT8dZ8Xkvo GIUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cHls56Du; 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 v41-20020a05622a18a900b0041cbafcc5bdsi2168638qtc.121.2023.10.28.03.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:36:38 -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=cHls56Du; 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 1qwgdQ-0006Mx-22; Sat, 28 Oct 2023 06:33:40 -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 1qwgdI-0006JI-0f for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:32 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd7-0003Av-Uv for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4083740f92dso22745295e9.3 for ; Sat, 28 Oct 2023 03:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489200; x=1699094000; 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=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; b=cHls56DuOt9QIuOnEECdvO02rYcYpQohBJxna0ODIWI6DlHwq5H7wz9T3z2mRRc7Hv hFZCi7za523lzWmY2hV5XuzqoZn5Hkj20yLK+WruUoH6B/g2E1A0dwt9jJouYogNxwgt f4KggwPoj4EQs4ZPsxTDuyfXoVkYSik//un25WZs7RE8SmBKjvwAC0dgpteeAwCZ4qDp f+dIhJz5vtltOnSC01jBcGUhVNbxPj9j+sZ11LSEPyk8fZ1vbc8FSx/uDjTbjgF+Yf+o rcs9r7sNT5PcaWQOJHLZC7dmW2SZ5DinRU7/ZDffoW2dgaWh7hxxkaEwc5Ch9CKI4fmI 226Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489200; x=1699094000; 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=bU+M83jUNRZkgug/gFeRzCF0q//PFmVsZWhfdTFT9TY=; b=ZT9g+xvL+HttrjKFODvc1GMfdQuhKMH49JEC9fC0mk1+lvlabd2mOLaB2cwXn05g2l v3iG7tZEn+4F4s7vggiruikVcUUa24Bxmp7cYMUyYKX+8gBOQIHCoYfOE+uSebQiDjso yif+W7yDmz9owRdVVE+2oE7Dj/54ytBB6M5DOip0+rMzOByrZuLT1wpPp4dCXSau3Xc5 bQ0YiHnIDHkPgQ/3dyzFFnwc4EqYCcxDBQXYB3hROFbwD7IQdNucOMBuAtTxvXT1RMWg +sydUrI2Pv+OK/PWc6qO2mcDM7UWeAANr5EuNTX+CPENS+HMds9NdCaFEPSDogNivWfw 17ng== X-Gm-Message-State: AOJu0YzGQHClnuO2sO9DrW/XxQekOuLdx1d86DkcrrMbogOlyhoPR/Np RzznffIhJooNVV4+FD/Wib0ukg== X-Received: by 2002:a05:600c:190c:b0:402:bcac:5773 with SMTP id j12-20020a05600c190c00b00402bcac5773mr4591087wmq.38.1698489200704; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m1-20020a05600c4f4100b004063d8b43e7sm7264686wmq.48.2023.10.28.03.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1F57A5F76C; Sat, 28 Oct 2023 11:33:13 +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 11/17] tests/docker: use debian-all-test-cross for riscv64 Date: Sat, 28 Oct 2023 11:33:05 +0100 Message-Id: <20231028103311.347104-12-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::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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 | 4 ++++ .gitlab-ci.d/container-cross.yml | 7 ------- tests/docker/Makefile.include | 1 - .../debian-riscv64-test-cross.docker | 19 ------------------- 4 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-riscv64-test-cross.docker diff --git a/configure b/configure index 2d8c7a0312..20247bc149 100755 --- a/configure +++ b/configure @@ -1348,6 +1348,10 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; + riscv64) + container_image=debian-all-test-cross + container_cross_prefix=risc64-linux-gnu- + ;; sh4) container_image=debian-legacy-test-cross container_cross_prefix=sh4-linux-gnu- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0b48bf0172..1436ef8784 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -67,13 +67,6 @@ riscv64-debian-cross-container: NAME: debian-riscv64-cross QEMU_JOB_OPTIONAL: 1 -# we can however build TCG tests using a non-sid base -riscv64-debian-test-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-riscv64-test-cross - s390x-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 04ac5f9c79..0e8133109d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -125,7 +125,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ DOCKER_PARTIAL_IMAGES += debian-loongarch-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross -DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker deleted file mode 100644 index 6e631295bc..0000000000 --- a/tests/docker/dockerfiles/debian-riscv64-test-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-riscv64-linux-gnu \ - libc6-dev-riscv64-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