From patchwork Tue Oct 31 14:43:53 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: 739574 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1687839wrt; Tue, 31 Oct 2023 07:46:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmZTHbYaZaaZ9OmbARDSqm8fVcVjI9StdUI52d+Eri7URZrVrWWM0y4a7H4c5Yc0xpK9xs X-Received: by 2002:a05:620a:1a81:b0:779:e171:3356 with SMTP id bl1-20020a05620a1a8100b00779e1713356mr15188381qkb.53.1698763589217; Tue, 31 Oct 2023 07:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763589; cv=none; d=google.com; s=arc-20160816; b=fsTV4Vjwy1tRHuYUXPBSMN0K3X+r5sVvOQ06U3YChcVqfuS7q3U0aBH1oBXT75FsEu PPeULNBa8jF13IsIOMGV+eZDmI9cut0v5T+O38DT6WtSgfFoLg2JA09lPsK21s+9azKb ymPwzv9/x1KDMq4LoSAvKspgAFc8ZnqqVmISER7WLgWuMkGqdQ85wQTpOUEfrPZKqqdF PThpfTYa9ll2yzLeF/h/fjlX0OylpnG/tHvjT9kBIKM6Fy46We0LSyQ6k2O/L5+BgLE3 9217mtRJlONrpdSsop4OoKIvVrW5ev8k6ve87nNtPXazdYhaaijTQy20BvLwmd48SbPt Yqbg== 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; fh=LultvDE5KmYCspChf6UrcXF0J+sB9F86yHHmgOA3JH0=; b=cGErmTQsIHRfbyW+mnOaA5Zc/X1QsZ7mvLRHRX/E2qKS5OczBujl45GwldqveRz+AJ qKSpbnI1osfVqwcNrQ1Iy/VdSp7KGo0bpv0luk/lfN6Li1PS/68bVOvzoWHhRoqJC65N 7b2AohjXFAucH6CnhM5sfqxkM8AYpf4yea7Qmp5KkoXj8t7+n2AbHe9gOEgsjcOeL0bE Z4RQCgM54fqICMzzi/0jfDcnJNLwrVdUcSMW5hP8VFh/Tb6RM4oZ12xg6/5+j7BjFqYq DIzzJVldzAAKl3zWZz0eDyIgQH11CEEQPJsS7zPooRH5cHmUHsS1s72xDceXHxZNiYB/ 7Bhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xD8A6YUq; 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 o19-20020a05620a2a1300b0075f02d4d588si1226906qkp.117.2023.10.31.07.46.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:46:29 -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=xD8A6YUq; 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 1qxpyd-0004t8-Vc; Tue, 31 Oct 2023 10:44:20 -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 1qxpyb-0004ra-Vz for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:18 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyZ-0002CR-Nl for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:17 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4083f613275so41441325e9.2 for ; Tue, 31 Oct 2023 07:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763454; x=1699368254; 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; b=xD8A6YUqDhp+srO+lLY5Dwnu6Mio9ZD/IVGPMDUDbVfGuzQtp+plTZMhnx0EDp/0XP MyAq7/wVKffGQp9tlcm06opQ1kkYtjvAWZ8wIlK9Y1FFDHaLaBl8ui35l55XN8cHUuN8 itqu6YG+cFxOsuTzCFkk2a9ywz57r3zvCZpdSqKJHSSOslnBY/qQWDYrCJVQtTilaF9v B2sOolFmj2cdv9UjXU9c6nYezmUPVOIzqPa6gsWCZqeJUZ3v/tTVxfxhb4g7D+kD4mhv hL3f1xgozrs2mjXeyvC1XUlsycYs6pSaHspdZxV/8l7ehBycdZJPwhyj93PZsTB2rPZ7 lQfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763454; x=1699368254; 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=LVFhKh46M5GfStLPcCrXVqXvAAmQhHpnjdsY7O4fjsA=; b=HO4SdldEReYvSKybUGCNvqAcmqJR8omWgHcg0G21o9UJxPnVoPh0xJCjNAOCOPujC+ 9VZn0mmN4YQcyEYxIRwJvDHk4KLwu9mvsCZ62LzptjIPRbP1s5Tzd4oBf1ntZK7OAlsE qu69UqLil+6Kj5Dwb5+fJJh4jiN4GsE10mPK26BuLstjAZeYKkds6V/8Sh3Z16OquZK1 6pFdm1Z/rGwtmV8ACHn1V6u8UD4zlNHOXfaAtuCqAlV6gspyaiBW7Qm/U4Pzt8Gv9MG0 U0EUh0TM1+B9sD0lO/MQHBi91XdCpkVoQk72ZTiCWvx9dwaJ4O7XKctA/ImeouZb2CNt sMeA== X-Gm-Message-State: AOJu0YwBzRxd+OjMbgKmNesXKMLAiNkLKEz/3nD5WIvPH6nJAriW170z OnbXz15YaEJhWIH9kSVezFWGRA== X-Received: by 2002:a5d:62cd:0:b0:32c:c35c:2eea with SMTP id o13-20020a5d62cd000000b0032cc35c2eeamr7724723wrv.6.1698763454398; Tue, 31 Oct 2023 07:44:14 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v12-20020a5d4b0c000000b003143c9beeaesm1680729wrq.44.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 D806D6572C; Tue, 31 Oct 2023 14:44:02 +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 , Jiaxun Yang Subject: [PULL 11/19] tests/docker: use debian-all-test-cross for mips64 Date: Tue, 31 Oct 2023 14:43:53 +0000 Message-Id: <20231031144401.1238210-12-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::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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-12-alex.bennee@linaro.org> diff --git a/configure b/configure index aa29cfb797..2dddc3c82d 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