From nobody Thu Jul 24 20:03:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bp24w2KH5z6372Z; Thu, 24 Jul 2025 20:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bp24w0Z8qz49td; Thu, 24 Jul 2025 20:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753387424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaDxeaPBgtfoLZSCiD9lDWFxu8u+2bJnI3zg19aJwaE=; b=cuzDLd7I/KWGyd+izq01iX0hWAEwraNowSMYhGdE69B1TjEHX3d8OE7vfm3+id3HATkPBD ZdQgcOh8ACxjEOGiizE2xcPGz4VM+lgpKfpj3cTMy5CB96QozIcvhAnO62CZ/zvKQd769H 5sCBZv2c67TaCxcbBRssircinA9xCK0fzJ0pPBUQaABoYCP0nbRA3FCALmKk0jk2bSGblB HoqZDzFhHEOllqihiKDHhK85aWZfdIiupI3mzTK6D7l56Iq1YWMDpzmhOA76diQ7kGIhBX tjeCCDGaXqGbwmD8wSD2uefQuD9K2AtDHgZrJux924HZF7Sfd17LV6d87+CbFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753387424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaDxeaPBgtfoLZSCiD9lDWFxu8u+2bJnI3zg19aJwaE=; b=C0huHt+HF/9qV9Ri+aXSYTWHm8Jk9cmvVN0sA9l4pKQJ/iU4ygXhCp+T+aRFDRD2MhwsRt gjN4OXnvjNSi1aE+pP+KfLARS3O0EYCHrJIqJ/4tD2dypA65rmakdE34ZQVzyBfZDBdrmk bJYc3wIs5v5AkUSu2bPSFuqCilc3qKeOYUZPgXAgIEA5w9p8Mib90BBqmZg7bKklqUOSxW pd+O+RPqxcu6aRMaxAWZollGP+z4WFP/pg/AbPFj0J0VTl05i8NVH+0DQM5E0qKCkMTL0a IOBTxgxwsdFpuQvO8a8rJmg8WrtpqIe9oYGxqrNo7jLH8mpT4/03pKa2WTxpYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753387424; a=rsa-sha256; cv=none; b=qCHm+sESCm+vdj0LKDIF2QvfVFXgePK21ZRJQX8Qs+8KaGyVG+7MEjrYnUj+VoF80hTuMZ 7skZ0ILWZPqTuxjcXVxAy4nAH9FMgS49ugEzBdEwoRY2ZeQnBvzpOvdoHoMuV5ISjlJA7D z5E80Qr2CDpr8249ohMqUV0pF5m+EBxRYrbHf82K6E+dz5fbzJQClUkzF/IdFakBk7aC/6 iXkxUZ0Zzm3atFzgh/AYpRnEayFnc9AnCPfJybNUs6+c7EkESSlz2nFgk51mxT75VQV0Z2 7YMzlEJ7dTZXZF5ywQoM/Fkw8IkxJFe6Lcq4jLzzYl0nOZfNe4b57jTBagpvNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bp24w0B02z1C41; Thu, 24 Jul 2025 20:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56OK3hJ3092841; Thu, 24 Jul 2025 20:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OK3h4Y092838; Thu, 24 Jul 2025 20:03:43 GMT (envelope-from git) Date: Thu, 24 Jul 2025 20:03:43 GMT Message-Id: <202507242003.56OK3h4Y092838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 10fb5e7117e5 - main - tests/ci: Fix race condition with ci-extractmeta List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10fb5e7117e522540167fa02692e1e7b8e38eec0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=10fb5e7117e522540167fa02692e1e7b8e38eec0 commit 10fb5e7117e522540167fa02692e1e7b8e38eec0 Author: Siva Mahadevan AuthorDate: 2025-07-24 20:01:50 +0000 Commit: Li-Wen Hsu CommitDate: 2025-07-24 20:01:50 +0000 tests/ci: Fix race condition with ci-extractmeta This solves an issue where 'ci-extractmeta' runs in parallel with 'ci-runtest', which would extract an empty test result into the final test reports output dir. This also cleans up the intermediate temporary files created along the way. Signed-off-by: Siva Mahadevan Reviewed by: emaste, lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51363 --- tests/ci/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index b8797e06ac75..ac7faff3afae 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -205,6 +205,7 @@ ci-create-meta: .PHONY ci-extract-meta: .PHONY tar xfv ${META_TAR} -C ${META_DIROUT} + rm -rf ${META_TAR} ${META_DIR} @echo "Extracted kyua reports to ${META_DIROUT}" ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY @@ -254,7 +255,7 @@ ci-checktarget: .PHONY ci-smoke: ci-set-smoke-var ci-create-meta ci-checktarget .WAIT ci-runtest-${TARGET_ARCH:tl} .PHONY -ci-full: ci-set-full-var ci-create-meta ci-checktarget .WAIT ci-runtest-${TARGET_ARCH:tl} ci-extract-meta .PHONY +ci-full: ci-set-full-var ci-create-meta ci-checktarget .WAIT ci-runtest-${TARGET_ARCH:tl} .WAIT ci-extract-meta .PHONY ci: ci-${CITYPE:tl} .PHONY