From patchwork Tue Oct 31 14:43:56 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: 739575 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688022wrt; Tue, 31 Oct 2023 07:46:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhPlxdhdNqk43IO4SFghtbQMTzWY8ANfc39kNtHEkjYPFCK/9bk4j1yiD8F4wvAGOSrlvI X-Received: by 2002:a05:622a:15ce:b0:417:a514:72cd with SMTP id d14-20020a05622a15ce00b00417a51472cdmr16818159qty.19.1698763613066; Tue, 31 Oct 2023 07:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763613; cv=none; d=google.com; s=arc-20160816; b=AdbVzSqbdOvS4B81hoKRIyCFUHZrbH89gBIN1HjmcGL+6yUp/PU2w8jZkWkKdKMY/Z 5MldpRWmiuwIbm2ZhLhnqfh/S6Wpqt4fVF6bBHjYnDttcwGGa3wiPJT2+wgjSjFJ1dPT k2RCsA3fh4+FnjfqLq8h4OOKw4y+LGAhGtdDeZGiPsvQcgIItO5oj5afwEZocriV69mD 2ZLITjt7pdlHemosuhZH6jblw3GpjDMsr6Gm+7u9Zc5qwIUcxxwCJNQ4gPhX0E1YCdGu ZZiSZnfm6aieST0nrlYHS+8uaSu+7JCkJ5hbA2Xihip2gENs9f5HCs4q0U5J+hommo4h YyeQ== 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=l1NLVfawGzuA2bINVnznAasxWi+hkidsntR5uu5XyNgsM/atjmkuvHWDdtUT8Ohd7d +Staz4DSp8eVs5tQ1vPHn293AQt+6Z+F7xhM3P+uPmBQ1AA7gZ8ZpVTG5h08Wd+CrT19 uvoJLmfBkV/rMWhS4q/aMI2ETWJ+GgKa5G+NV6ZlPWrsO/kdodpd2QX8hLsMZcmgoSb2 YMvQHeau7tBnoGufrqToDOvnri7uQUXUd19ki+bGyJi7mRrq5fkOTcvp2stQD/+5AAVx 8qKshrfKfk4s/lXCGG63FdraG/AyxjzStvqLmNEmZOW00xMB4+AZcAKfIrDCEzS8k2Uv yV/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UdnbWNJO; 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 t4-20020a05622a01c400b0041cbcce90c1si1244414qtw.531.2023.10.31.07.46.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46:53 -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=UdnbWNJO; 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 1qxpyc-0004ru-8l; Tue, 31 Oct 2023 10:44:18 -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 1qxpya-0004qP-0b for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:16 -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 1qxpyY-0002Bh-6a for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:15 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4079ed65471so41480645e9.1 for ; Tue, 31 Oct 2023 07:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763452; x=1699368252; 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; b=UdnbWNJOP4MqPW6p49JzHLYGZICOlsCb8OMsRP6dnfw3oVvwsijbF9n0ZdrdwD3n04 ilxpL+JHn4gLCyPkZZuov5CP9Evf0aJgUq/+TMRz3cz/+uO/Ec1WDRnKnqZBhSIO0noz X7nLcn8pmgtcFha2Hvep/mwLBB3qgoh6lDSE0uukGtCqbZcaWVfqK5AXycSqTLU/cAY0 2vha3mmYJd2pDu8Xb25IXjcMrz6IjSibDHiUvg9JfqZB//55MBqlSDNQGjTRh2bfDPtj O1ovtkLQfrkiWJLozb8h+IZICKv4eV0hp84XHM+nK3x9iA15+Ng2gr6YyGUOHaF+xDUO +IAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763452; x=1699368252; 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=0q9opczHMBVwOLIFJvZ4NidlFBVmSFtp8ozOnDPze2c=; b=twT+rQqt0fGwXJDx1+J/BPY7g1kFmggICLpaozJq7VCkRa4pRIrU5cp4TZIH8J4o3K V/hjZ74vyebw9bupAC4La0/HNpT5A8BxJ0ucwMZyNpCjTM+ErOcqLovfPU7fHdz+Ss8I nwqNdAefxsjnj98XOzPDSDUq89677RBpBcfHK4hQZXS1rCJclxeEa3Bbohy1z01BjS1q Iw2Qrt8spLkB+WoLVeWt+NM3rN2snfeS+cGADJPfEE7U6jbHCFyN7mokZaYz6CrBAS8R GO1Oxe9tLP3NOoe2Kab4mC0PoJlnXtjL0vrM/ysFfdf+oIDLpnshKZ8273Hr31NLhpzP lMAg== X-Gm-Message-State: AOJu0Yww4RM/hgelpuDDpVv5i9WG7gODZHRkj346Wo5A//4t8NI7D5Jg GWcWc8POxTd1XDmowDJNIYRCsw== X-Received: by 2002:a05:600c:35cb:b0:406:44e6:c00d with SMTP id r11-20020a05600c35cb00b0040644e6c00dmr11157523wmq.2.1698763452603; Tue, 31 Oct 2023 07:44:12 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c465400b0040588d85b3asm1885190wmo.15.2023.10.31.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CB146572E; Tue, 31 Oct 2023 14:44:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 14/19] tests/docker: use debian-all-test-cross for sparc64 Date: Tue, 31 Oct 2023 14:43:56 +0000 Message-Id: <20231031144401.1238210-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-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, T_SCC_BODY_TEXT_LINE=-0.01 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: <20231029145033.592566-15-alex.bennee@linaro.org> diff --git a/configure b/configure index 0e0f0c60b5..f1456f6123 100755 --- a/configure +++ b/configure @@ -1355,6 +1355,10 @@ probe_target_compiler() { container_image=debian-legacy-test-cross container_cross_prefix=sh4-linux-gnu- ;; + sparc64) + container_image=debian-all-test-cross + container_cross_prefix=sparc64-linux-gnu- + ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 98940d0f3b..463ac493ad 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -79,12 +79,6 @@ s390x-debian-cross-container: variables: NAME: debian-s390x-cross -sparc64-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-sparc64-cross - tricore-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index dc55ecf001..cd4688bf07 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-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker deleted file mode 100644 index 1ef735f223..0000000000 --- a/tests/docker/dockerfiles/debian-sparc64-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-sparc64-linux-gnu \ - libc6-dev-sparc64-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