From nobody Tue Feb 10 13:34:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1769597985; cv=none; d=zohomail.com; s=zohoarc; b=ifCzCDCbEn0kX0IU+CM2fSN5ICN8WZPA3w9NUoUMsxbJ2nGDD7KQJJSlMYimmuGtoZytspkFwCRm77JsNvDu2MtDJAtLUr6ngB3CaJV3OOelDKiDrKJbdC7zyPemuaGJVichsj71J0lBiWHcF7eq+jtHr4KI6CZXLr2RP2ayQyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769597985; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=agrbkcnFuSQU928f+MQUS5x78zjmJt+bu4nxcabObN0=; b=XZeM/1ljxZPAoX0BcLB3s0SsYublulfQYymX0pXe/IXpOPT+foXjvEIanIKc3xSDXx6lOv4PlLQctcavMF9v+XBYLGbJzhrq1WCjrzBaTgJlXcTGOT0P+5dDPxJZxkmustJhwhRi2qJZb19k0eTpAv7fbzt0LtfFA3RchwdtxF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769597985720130.2980006271216; Wed, 28 Jan 2026 02:59:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vl3G7-00027U-Lc; Wed, 28 Jan 2026 05:58:51 -0500 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 1vl3G4-00024d-94 for qemu-devel@nongnu.org; Wed, 28 Jan 2026 05:58:48 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vl3G1-00029P-8F for qemu-devel@nongnu.org; Wed, 28 Jan 2026 05:58:48 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4801ea9bafdso27660015e9.3 for ; Wed, 28 Jan 2026 02:58:44 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e10e490esm6044140f8f.9.2026.01.28.02.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 02:58:40 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8839D5F895; Wed, 28 Jan 2026 10:58:39 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769597921; x=1770202721; 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=agrbkcnFuSQU928f+MQUS5x78zjmJt+bu4nxcabObN0=; b=C7fXruNUMbY1qyiOVDaXCx0PCUA0+32+eqV8ECDKwPXNX/6RYohJi941g79lqTXQz7 eyNlpl9H5jt+j88ZpHWwv8+zDOX6dqrqCkrNP3F1IAsrwr47P9c9tzsvyqIOnVuhA0f7 vLWMow/ndLN1SC0LtXGa2gO6wl79N//NLUPJqJT+mP6yZeDF2LfnOrAYrNF4gBsj9Nvf fMwOyLfUZ5/ISFGrP7ax7WvXi1murtAENYD2hONjB5eD8C5A82YfcafPQu7nkWXQHin8 aC+E5Z61i3SPBMQAZhlwGA39RYShZqRBp2HMG+nVtTAO59fnxD5bAd3HMMRUurshL2IE ACeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769597921; x=1770202721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=agrbkcnFuSQU928f+MQUS5x78zjmJt+bu4nxcabObN0=; b=SJ+fYrmnzGg4O/E14nGk9G1WqQltCYvPAUiIUkKLAD5rysZND1IqzfFUetTtktk/tJ VQpk2SwbjMfya1liMkkbGcH4ykZdjZGPHDmn0xsVWH2+gEiG60pfB0Jqf6dKbUZ+kb5M HHPUUmq7+OmGIbArpYwrm7tpxWxQk0OPgShZrMgcxOm+x5mzQv+4jf0kDhRP1W6zRnmn YrDKD9dRlHVCOuZHZ/MAok1pAN5ktn78UpDhChUfGybPzhMxulK8vzghncD69mXUGzsD nPi9rYOu5R0cSwl/hf0IM7YuGbzo5S+41o51bNQgfwf1XHXnKsH9GWZ2J01sp8phhIu5 wuHA== X-Gm-Message-State: AOJu0YwalV7VoGzi4fQp9dLOMcwurXLX7yaEmyzzqZW681RyVc+b1Qke tpUsKFOh3knTcSTjCIcdAfKfC5fNaSNMsq5S73nOXZd5CiocLHmWnoGttTNzOzIicTs= X-Gm-Gg: AZuq6aJQiJVwbC0YJ8cOoFlroW/qCQwI01ldbBwjqHYQKjEbyKeuC/jFAR88ohNEpQt 2ODskVsJOfYSNbHIn85l2vRCuJ28QLQcFUpq6Uc9/05p6d8MD0z3rTR9YNH2yLSsMDaY5AL9Z/r nS5z9KBDdNi5RE6Zh9RYHKsusliy5DX2igRCYbgTUyni0EI2Zu/Hri1CxnkmUnQ2rtzatNLx7aF wH+ekah72wUC/OtILTtgJJeAL3fr9tRP0dM0WgIw9rvPCstQssb299AasoGdRvCIWOguaL4qACv sxfzXc+oYhVIqm7q0OZ5/2gj6+i7MpFbvzH1rJ5j25Aav8yV6W3OiOmijPfETFD1tTO7m1CvQiw 0FXOdvjrhS6/Y2cwS8Nu3HchiYYBZMpBnOyQAmk2z89EDIYYghHXH/WMI8pkBg/fI8kOjb4j6QT EVN7rNyj5CXFieifSW+diANw== X-Received: by 2002:a05:600c:4592:b0:477:df7:b020 with SMTP id 5b1f17b1804b1-48069c48936mr53908845e9.18.1769597921305; Wed, 28 Jan 2026 02:58:41 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Thomas Huth , Radoslaw Biernacki , Pierrick Bouvier Subject: [PATCH 1/2] tests/docker: rename wasm cross container Date: Wed, 28 Jan 2026 10:58:38 +0000 Message-ID: <20260128105839.3487840-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260128105839.3487840-1-alex.bennee@linaro.org> References: <20260128105839.3487840-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1769597987601158500 Now we are 64 bit only there is no need to keep the generic name. This also fixes a check failure in the weekly container build which was checking containers based on the expansion of DOCKER_IMAGES which is based of the dockerfile names. Remove the DOCKERFILE bits that were added to handle multiple containers from the same dockerfile. Fixes: 4203ea0247f (gitlab-ci: Add build tests for wasm64) Reviewed-by: Pierrick Bouvier Message-ID: <20260127092745.2978371-1-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 --- v2 - also revert the DOCKERFILE bits that are no longer needed. --- .gitlab-ci.d/container-cross.yml | 1 - .gitlab-ci.d/container-template.yml | 4 +--- .../{emsdk-wasm-cross.docker =3D> emsdk-wasm64-cross.docker} | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker =3D> emsdk-wasm64= -cross.docker} (100%) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index d7ae57fb1f5..2a0cea6ce1a 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -78,4 +78,3 @@ wasm64-emsdk-cross-container: extends: .container_job_template variables: NAME: emsdk-wasm64-cross - DOCKERFILE: emsdk-wasm-cross diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 6eaa2f804df..8c7311cca57 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -10,14 +10,12 @@ - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - until docker info; do sleep 1; done - - export DOCKERFILE_NAME=3D${DOCKERFILE:-$NAME} script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_= TAG" --build-arg BUILDKIT_INLINE_CACHE=3D1 - $BUILD_ARGS - -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "." + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout diff --git a/tests/docker/dockerfiles/emsdk-wasm-cross.docker b/tests/docke= r/dockerfiles/emsdk-wasm64-cross.docker similarity index 100% rename from tests/docker/dockerfiles/emsdk-wasm-cross.docker rename to tests/docker/dockerfiles/emsdk-wasm64-cross.docker --=20 2.47.3