From nobody Wed Aug 27 10:52:45 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 4cBhFV0GVRz665sr; Wed, 27 Aug 2025 10:52:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBhFT6Xrgz3TdM; Wed, 27 Aug 2025 10:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756291965; 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=a3ahxevdMWjaEFfr9CiuAX0x8yyyzi1UQC1pIdK50ao=; b=cqsAaR2e4NcVZje1ij6eILii0TW7aKrUiKtlvReBxo6ZxF3UkhLMWanhdytoRP6McbD1QM 1y7UjljyDE8IH+lLbH5x7gjN7yU/+zW4SFbTgwQGgjFRcKgUqJuUeQNZX+gALKXpLotjlK JhsoFZ8bRBrW70j6+VR9e5M4G1FEiarPa7DqqADd5yF1C6Ljcu73hGPOHAXZAKKToEvfRo IF5UZrNwxDXUOiS/ZxuL9mRtBB3qSJfTH4cBsdPMm6YY5Ge9xC9RsozlXuSOGUYc5kMYsy tPv23bBUi0JVkIqJPfYq741rTeEqXUgJQpWLHnXs2iNRUzKBMtOahayAP0+Ocw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756291965; 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=a3ahxevdMWjaEFfr9CiuAX0x8yyyzi1UQC1pIdK50ao=; b=RhvvL/9l++9BuJM9XqzpJXXtrPNMwWerOQsh3Djbd7ei+/TsRFjOIG6qJFlroN+WjH8Efj 8uRriJNQRgmE1o+3RkxKGntMdfw9TaqClqlbwHNGtfNqnNQdWcXohvjc5kC9hXMZJkxYZJ aZVc8N1LEoPoWEZ+N7+xrje4pxr0ePlHSW8LP/c98plDdxuLUCEuziP/2TGPtVpXHNurZ8 WSjQcnPUoEd/9rqI8kw7uH4v3zTwdSUZ6cgnZNf7ttuHx07RETF3aCdBNHVJ+N84BQ8PDW 17Iw52Pm4U+1kS4T671yTO6b3mNhe14iD/RbQN+pfIFmTo6tXtrpL7esxarcbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756291965; a=rsa-sha256; cv=none; b=sBIYBFxC8PW0xArISDxmiPjRlU1+jp8TfjprPXcGCYjrKCJlj/Sf+GIRY3dc31DinQxpTl J34HbEiti+jrvXGQgtmFilrinL+oIHKaUgywsUBgVXdeW6mtu3RB9Z1l22RLm0JJWeQkM+ 645aDWug3o69zqo4xVpo4yDeYDnGa7N3cxBPrQs+sp47LRUtf8X4ELIZr9o6D710f0z7zY z/tH3GknZYuRKR9HTKeghdQFwjpj5xkAclY9lyWlbnOlYo5FnrjWUd2TmfM4UHrbm+DEZs /+X43anUurqnRI9qV9aIQWwzKoAEntSAIrc7SeLZKh1SGmxZ74uNtHSU+W4QIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cBhFT5vVBz40h; Wed, 27 Aug 2025 10:52:45 +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 57RAqj7c077793; Wed, 27 Aug 2025 10:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RAqjUl077790; Wed, 27 Aug 2025 10:52:45 GMT (envelope-from git) Date: Wed, 27 Aug 2025 10:52:45 GMT Message-Id: <202508271052.57RAqjUl077790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 932cf5fa44b7 - main - tests/ci: Add CIENV variable 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: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 932cf5fa44b7ff3b7ea21ccb32bbbefff11c160c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=932cf5fa44b7ff3b7ea21ccb32bbbefff11c160c commit 932cf5fa44b7ff3b7ea21ccb32bbbefff11c160c Author: Muhammad Moinur Rahman AuthorDate: 2025-08-27 10:46:59 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-08-27 10:46:59 +0000 tests/ci: Add CIENV variable The default behavior of of pre-commit script is to suppress all the logs as it is assumed that developers will run this on their terminal for the tests. But there are also other use cases like running these in different CI tools like Cirrus, GH Actions etc where these build logs are important in the web interface itself. To fix this issue introduce a new variable named CIENV which defaults to local if empty or undefined. If the CIENV is local in those cases the logs are suppressed while for anything else it is not. This variable is also important for some other WIP projects of CI I am working on like running the CI tests on remote cloud AWS, Azure, GCP etc. Approved by: lwhsu Differential Revision: https://reviews.freebsd.org/D51178 Event: Oslo hackathon 202508 --- tests/ci/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index bc45c6acdfb4..30ca34a810be 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -41,6 +41,11 @@ TARGET_ARCH= ${TARGET} .endif IMAKE= ${MAKE} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} +.if !defined(CIENV) || empty(CIENV) +CIENV= local +LOG_TARGET= > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) +.endif + .if defined(CROSS_TOOLCHAIN) || !empty(CROSS_TOOLCHAIN) CROSS_TOOLCHAIN_PARAM= "CROSS_TOOLCHAIN=${CROSS_TOOLCHAIN}" .endif @@ -170,17 +175,14 @@ ci-buildworld: .PHONY @echo "Building world for ${TARGET_ARCH}" ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \ - ${EXTRA_MAKE_FLAGS} buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ - (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) - + ${EXTRA_MAKE_FLAGS} buildworld ${LOG_TARGET} ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY @echo "Building kernel for ${TARGET_ARCH}" ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \ ${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} \ - buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ - (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) + buildkernel ${LOG_TARGET} ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY @echo "Building ci image for ${TARGET_ARCH}" @@ -190,9 +192,7 @@ ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY ${RELEASEDIR}/scripts/mk-vmimage.sh \ -C ${RELEASEDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${VMFS} \ -i ${.OBJDIR}/ci.img -s ${VMSIZE} -f ${FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${CIIMAGE} -c ${CICONF} \ - > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ - (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) + -S ${WORLDDIR} -o ${.OBJDIR}/${CIIMAGE} -c ${CICONF} ${LOG_TARGET} touch ${.TARGET} ci-set-smoke-var: .PHONY