From patchwork Tue Oct 31 14:43:48 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: 739565 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1686974wrt; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8AeJGm2frAiWXxoQ/83j/QK1ow0Z0VtCTNOytJxQfjT9WBKP7PC1cD8hyv7HesXe65sod X-Received: by 2002:a05:6830:4105:b0:6c4:c6f5:3409 with SMTP id w5-20020a056830410500b006c4c6f53409mr13721245ott.2.1698763499368; Tue, 31 Oct 2023 07:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763499; cv=none; d=google.com; s=arc-20160816; b=o3spTYPqGKdV0SOlM4S+IGImztizmeVriDRYg8nS4DXUvWOXl/ahb5g5Z/FPsIKccX jFSxSrBHeZevMrdqtmePZrMvMkdUdFpUp+6t8+0NFdyLlGwEsRgV3VfXDS5bsyxl3ltq N6v42kflHWjM3AcJOKJuPUk6d62zR7EVzjMaRcArygLk1eXDXRyXqUyD/SIhl8pHJHyc FKs3MCdykmH69juAajVXbicveMpzpzd/psYVZMgZLJFLag+1ifrJSUlVLP0G7+oW6xs7 mkTDFea5sn0vE7b6m8aBaxhaBbah1vWim7cRoj6se0Giam/f9FVg78W8dVmb3mV8mzHr Y+4Q== 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=vcArt67R8pTARTOzjkkhPp5Y+wUdSZSesold7xBCjNB8PoeupO6yaq91EeviVVe492 jvbpHXXRm7wxbGJm5qd1Q7QZJNGER+q2iqcVhCnaBr17JQxDAUjC77ihVKhbOwIqyEYt j7c5df4LwP6tD/hnMtBn4T8bFkQfZXb7KJXTI7r97UIVXKwc7HKsHkLDAMdwhYdZ0H8k 14PZOR4Fpm7/0bKAyVAjPxfeSeGwlM2u2RMQcOJQwcvSlUsLyCrQ+sj7TYNImDF3IAaE l/JdXCPkcab/qMSci7GTQ2GFfJ4eSEkZBTA5gEICSHlOmCztMGf38DjFzwPqE7Evlt7U xyYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dkE1fgfQ; 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 m11-20020a05622a054b00b0041814926f4fsi1233721qtx.91.2023.10.31.07.44.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:44:59 -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=dkE1fgfQ; 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 1qxpyY-0004pL-Hu; Tue, 31 Oct 2023 10:44:14 -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 1qxpyW-0004oD-2N for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:12 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyT-00029j-9m for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:11 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507a3b8b113so8292975e87.0 for ; Tue, 31 Oct 2023 07:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763447; x=1699368247; 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; b=dkE1fgfQsj/cOrDyEyKdM2tiXB9IYP+gjGlgXjuH4Y1lRCcPK/DeWhrbyL5kudSeuU /h51SUfAqjoHbSJRX5qz00f3SZ6gtYbWpV4BImu3y6wcabS22zBG5gESz/nF5AJDYN5a X1VqD95rJJlLBtX0DTtDvbgiguecQ336xzNAswoSo5Goniq54XHnKseYtro5dYDK1b/b KEHSZ+SEXY9rt5LZYXVSLkkmsw6+hVg2IUwXqh2aPGYzkVFP73c7UkrzZeRZWng65PJd 9tgPzETa5JFRA+qFSXYXtP+SCNNSOJs/qO8VkPNx+ulLAiJWg0TpVQ6XTkgMGMVv3jz5 iiTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763447; x=1699368247; 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=DQGp6YloSStGiLyvzpzmbyXDw10os3RcjMFIgCFvBmg=; b=EPdfGzMkznroB4C395Rlm+mbHKhWgZ2Q4vs4rjxPWkh6j193MASxjIBzQq8jEyYzDi O437Zt5Kglsv1+AnYQM2JX3aOfGprJhZLtOqDvBq4OwQ/2CLeAWlTzj0aF2Fqh9p+UV6 DrdcBns9oPXmVBBce5q1Dk4wniyjFoYHn6QtBXyYM+y6+bHSk5j687oKMn/eqpBHhcog S2TaWug5XPWy74jefM7AF629hhMLuQ07lT8E1wrCGZy/J1fbYfE1G5nyf4P7UeSwNs0R mqCg0uf9odsT7BlaUef2ofFEB8SibAGfuN/ZRdh+u2N0D5IsacpjJ/dEsEhSfhdLO4uw q06A== X-Gm-Message-State: AOJu0Yx/APx/k4mP0Msi3T0sSnlarnUhx+pFUxlmbGTN3ETNvQVikney sh/CICkYI/+cv7AXSmJnFGHa0g== X-Received: by 2002:a05:6512:3a96:b0:505:7896:18de with SMTP id q22-20020a0565123a9600b00505789618demr4795714lfu.45.1698763447772; Tue, 31 Oct 2023 07:44:07 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c229000b0040596352951sm1929366wmf.5.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5B6F565728; 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 Subject: [PULL 06/19] tests/docker: use debian-legacy-test-cross for alpha Date: Tue, 31 Oct 2023 14:43:48 +0000 Message-Id: <20231031144401.1238210-7-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::129; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x129.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-7-alex.bennee@linaro.org> 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