From patchwork Sun Oct 29 14:50:27 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: 739046 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp742726wrt; Sun, 29 Oct 2023 07:52:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3T9slFi3m3Z4ZXGtat7zMx3ngDOqJ0cKdKSEcIrYpMs7QfiSMt0ZJVeXZvc7ieWLwC5kq X-Received: by 2002:ad4:5ca9:0:b0:670:c9e2:24d3 with SMTP id q9-20020ad45ca9000000b00670c9e224d3mr6220778qvh.34.1698591127599; Sun, 29 Oct 2023 07:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591127; cv=none; d=google.com; s=arc-20160816; b=gqKSdNDwT3V5b3oOyBuqX27hkB4uRYWHQO/mzBNfeuc+cxgMoDz+NLWGPXSrFtIFf+ X4yC6Q8U3i3odxPW0RdWImcWQgbbBytWuYyiA09a2s8YYkCCdLkzRjH53wkG3hhoTT9x xGj+zmtwYgYXLMSOyl/iN4MqHHxpjFSQWiBu2MCeAck43wJgvA9zmP/2FJFea/4j77es k5zHEUNu5KrMHg898nmn2+Z7NP83T3CGwtQ4HjslkYAl+/+SYdJwU0TQqLtuI9F0qDE8 PGKkPHjSF5KTMM7/C52dOJskcqmbW9ESUH4RFgkUO7uAIHG55gT7PTnBZOiwHL0ah9z9 ecmg== 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=c8nyizU8hixlWhc4xGz5/y+Ubdw17kvMQCfwhN7bWy0=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=n8D3C3ldAG7G7eluITxjN/VoEJ3beNx65EQaPv3uRkTXL/V/MZII1964bgGnzojgH4 bh2wtFj4JAcAkLFdE6Phw+AzU1O36zC2IHSPL8MOm3Dp3vXDTKM1ijSj4GAaeZU0yUdu drEuaWlMyiswzqLXnzeFyaMOBR74CZMpYUQjdBlxG2vPPwgyTw48EngoyUW/lb8XgJN2 XThuJFinQbvDlkmf7apNfbhHus4GnXzsUAKe1yEYR16AtNzXN9AlwIlXFvdQPZyoJwyv B2IWNWwZ2PBwshjMA0vp4tgp/nvTt2vueOgBHBZ5HrkcQG+v3olJcUv3EhTUgsrmI2dC fOcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yz8S2+bH; 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 dd5-20020ad45805000000b0065afa9743aesi4054977qvb.460.2023.10.29.07.52.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:52:07 -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=yz8S2+bH; 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 1qx77u-0007dr-ON; Sun, 29 Oct 2023 10:50:54 -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 1qx77o-0007X9-SE for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:48 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77j-00058l-I2 for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:48 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-408425c7c10so29083225e9.0 for ; Sun, 29 Oct 2023 07:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591042; x=1699195842; 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=c8nyizU8hixlWhc4xGz5/y+Ubdw17kvMQCfwhN7bWy0=; b=yz8S2+bH7FzemQGZ9NmyrMd89v9xR7Y1IewFgnEIp/55AKy/jkW1Ik25H7KRzA2Uys 23zD48RzceL9h5ZRZGuWFRuqamoHVcV1NVqJ+1cpfedOdxJUW7raMlhYypT4IX2w8K5g AOtYGxCs1us678hLQAQSsSufB4HxSZrDlZJcyHF721IlRmsnIPMOSkeJIqwYWhAqcjts UF+1lzcb1xJLy9DJ1w/EfdHkLUgzZx8NKUaAd+YOWPy5cWB/u2oDTS0BUrlfkk61bUEh OsrZbuCbdXiPuvrs9Mz8FLL1EXvNDRrY2KL3N6BGl1aAwdH1fzGjEfKiJlBmKmlkbNZm WMfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591042; x=1699195842; 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=c8nyizU8hixlWhc4xGz5/y+Ubdw17kvMQCfwhN7bWy0=; b=gw0TZOUrXNoCFrfmSi7sdUlIGAS/yorXXWmLWcv9Hy6ezN6dsMxIYLjJNjIqZyhqH+ Lj170m5LFrYo+Fp4/pkt71ka8ysM81qfK6fzbwCvErwGhF7Wov1mDBaD39VJBh77LNh7 eZxLKMtdVSgt6XBAaDoL0VhjKAcPRiEBX+MavQUbIQg1MIjVn+CgAgJ3OBGhmsEoVc/x I/9wW34SWnfwb4rDvunKop/gX3nJiJlixetCnx11CohD7gO7S21n3UnDYfJzrSzDmxmT bTaVX5jg4JWYFBy/1YiPOuXWv/EBUDUuoa2oYEhSPgWsNiU11T57rVNY4gxA5dnysS2i dykw== X-Gm-Message-State: AOJu0YxNXk9Z3yTYYTzzPTRTikQWuDy3fFP8FGL8ym5mGO4I+mlNVZj9 TCExBEYWqrpymoes9WzT9+VbOg== X-Received: by 2002:a05:600c:4f92:b0:408:543d:5532 with SMTP id n18-20020a05600c4f9200b00408543d5532mr6666341wmq.31.1698591042330; Sun, 29 Oct 2023 07:50:42 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v3-20020a05600c428300b0040596352951sm10062546wmc.5.2023.10.29.07.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:40 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5A59D656E5; 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 13/19] tests/docker: use debian-all-test-cross for riscv64 Date: Sun, 29 Oct 2023 14:50:27 +0000 Message-Id: <20231029145033.592566-14-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::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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-12-alex.bennee@linaro.org> --- 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 053330d6f4..98940d0f3b 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -73,13 +73,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 dfa9617bb9..dc55ecf001 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -124,7 +124,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-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