From patchwork Thu Mar 26 23:13:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2062 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1774566820; bh=xWEvdWyPrZgUT4aOVKConKAdcOITYVEHon21Hg70eIw=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=nIOg58YeahuYSk0BQabYVRb8WgFu/28zXe/qC3HzeZgieGx1YDOzDIxHSM+s+iHaL 7uU/50cx05J7etr0HGlmHOkswFP3B9GpfRc2RAlEN3/OK3st8ifI+HLrl79l0UtyeU upCEly6nU4a1XYR9gohD3coVRVH42uvRGxtLzmw2awUVBtE8r+RIN+w9syJV4owmUg gHbpWY4PN3qylVZSExEA+/th0gp1sqlL4VRuMxbVb8y6UVnLKwTTIcxPKwLbXINfBf mp6fzTnEcyws54RzXOa+qhBI1KXFBw4XJePUsNM3UTk50Ik5d9zDI5nRq9LBWGkygZ 6ZB0SzkM7H1bg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id F20E46A27A for ; Thu, 26 Mar 2026 17:13:40 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id p8lwzjefAmpc for ; Thu, 26 Mar 2026 17:13:40 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1774566820; bh=xWEvdWyPrZgUT4aOVKConKAdcOITYVEHon21Hg70eIw=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=nIOg58YeahuYSk0BQabYVRb8WgFu/28zXe/qC3HzeZgieGx1YDOzDIxHSM+s+iHaL 7uU/50cx05J7etr0HGlmHOkswFP3B9GpfRc2RAlEN3/OK3st8ifI+HLrl79l0UtyeU upCEly6nU4a1XYR9gohD3coVRVH42uvRGxtLzmw2awUVBtE8r+RIN+w9syJV4owmUg gHbpWY4PN3qylVZSExEA+/th0gp1sqlL4VRuMxbVb8y6UVnLKwTTIcxPKwLbXINfBf mp6fzTnEcyws54RzXOa+qhBI1KXFBw4XJePUsNM3UTk50Ik5d9zDI5nRq9LBWGkygZ 6ZB0SzkM7H1bg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DFE1F6A26A for ; Thu, 26 Mar 2026 17:13:40 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1774566819; bh=v6lgiCrMLhVYq30sdtuw2IgVLb/oHe1LA419hYhMnLw=; h=From:To:Cc:Subject:Date:From; b=b7/X8Uve6Pbtrw/ScLUfg7waXsrloHhH+W4M0+pXwXEKJdfwx5OtdiqefgOG0dLfn SXfifma83GOrxXwO008kkATfRGA10TPk5oJKIeHexeGxw6jOtFG19rR6qr6il04Ueg 7yv2HUKiSwkmKTp7YbxEnNwOvdNddyp5Wx7IkqSHu4SxvQS2Dic7ndmcF6EULCWDyx 1j5cpaGwJlKdNgx6hIHRhMu3zIeBASDroF+Pr9HeEi/erai6PpwktMyeatO72RNRCZ D/mekbVchWHOtAYjGBastFAdCNA25n6GLkB0DtmyIgqBuJDa4N6o2ukQxvrgd7XsLH d1zkEwqgL1reA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8B7E86A26A; Thu, 26 Mar 2026 17:13:39 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 0jJSH6vD_QBS; Thu, 26 Mar 2026 17:13:39 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1774566815; bh=aV674Kh39Doxsu0gztXyqWf4R+FhxE1ubwRdCl/rUL4=; h=From:To:Cc:Subject:Date:From; b=ExM5XVjsHwHy0XnVfaOXl4bV1Oi2s4wGEZ0N8rj0kTuCxA2Ml0UhjCXZzPXlDrss5 tzFgD9K6Kw5fktpumUsFys2kHMUrlTJbhpXk1fpG3IiDpQpXNIFvGY8cUAA4lSLwOm pi1pP8MUoN7jEAR5NQHxswyubp27egWRAxX9PMTa9Iv0D5V0wUsUc9K/Dy5JAq2FMZ iylAr8qh24kwDuTeDNsb2Shwk8DdyyLnJX9ep7M4tbPeH1uFX0aP60nj3RBjvlZZky JWwWzjju+dZcrul/R4/wYyE88n+wgZYYO6BU7jFmoxXUuR6P4JKZwh/vOh3CKj8Xu/ /bIGWxSLTxtaA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 97F556A24E; Thu, 26 Mar 2026 17:13:35 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Thu, 26 Mar 2026 17:13:25 -0600 Message-ID: <20260326231329.321882-1-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Message-ID-Hash: IE7FX6VYTUOOHCJ2CDNUTWOJ7BLUJKL7 X-Message-ID-Hash: IE7FX6VYTUOOHCJ2CDNUTWOJ7BLUJKL7 X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH] CI: Use ln -sf to avoid failure on existing symlinks List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The before_script creates symlinks for the qemu_arm64_lwip config and for mapping the runner hostname to the travis-ci directory. With plain ln -s, these fail if the symlinks already exist from a cached workspace or a previous job, causing intermittent INTERNALERROR failures in pytest. Use -sf for file symlinks and -sfn for directory symlinks to overwrite any stale entries. Signed-off-by: Simon Glass --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03153ea505f..3ca5a62b877 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,10 +64,10 @@ stages: - git config --global --add safe.directory "${CI_PROJECT_DIR}" # qemu_arm64_lwip_defconfig is the same as qemu_arm64 but with NET_LWIP enabled. # The test config and the boardenv file from qemu_arm64 can be re-used so create symlinks - - ln -s conf.qemu_arm64 test/hooks/bin/travis-ci/conf.qemu_arm64_lwip_na - - ln -s u_boot_boardenv_qemu_arm64_na.py test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py - - ln -s travis-ci test/hooks/bin/`hostname` - - ln -s travis-ci test/hooks/py/`hostname` + - ln -sf conf.qemu_arm64 test/hooks/bin/travis-ci/conf.qemu_arm64_lwip_na + - ln -sf u_boot_boardenv_qemu_arm64_na.py test/hooks/py/travis-ci/u_boot_boardenv_qemu_arm64_lwip_na.py + - ln -sfn travis-ci test/hooks/bin/`hostname` + - ln -sfn travis-ci test/hooks/py/`hostname` - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]] || [[ "${TEST_PY_BD}" == "xilinx_mbv32_smode" ]]; then wget -O - https://github.com/riscv-software-src/opensbi/releases/download/v1.3.1/opensbi-1.3.1-rv-bin.tar.xz | tar -C /tmp -xJ; export OPENSBI=/tmp/opensbi-1.3.1-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;