From nobody Sat Dec 20 16:16:04 2025 X-Original-To: dev-commits-src-branches@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 4dYTzS3VMxz6KBY2 for ; Sat, 20 Dec 2025 16:16:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dYTzS28Zcz3mKB for ; Sat, 20 Dec 2025 16:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766247364; 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=Zbg6CwOrS2/aCVK7J6QTL+RgqNkTGCI2dpQNNNgzJhA=; b=ZmXzBocRAD9zjCwxz8FvhFsN84AjROIcGpcpDo0MfjQ3KNRnmVgmgBe+a9G6CFbRRPeTS8 uXqq+u8zc6SexaOOpHVEuJpSwDvmWwCO53U7eBbaeT13Xnyo2cxgwXKgX45RwEDMj/kPKN PLpJd1B1jUYLBB+AGhRqc4aUxn5s/Zy6MrHfYim9a3K3y+nQyOpDW9VS6IgJhS4tzy6S7i siQL9iLrIIuyebjdkK/L9RFrafMLkJPrRmqwmxPNocVN+Antu+mpBhsTO7KijKMkPmZa2v jvQN0lQhXcBfH7ThWhcqvwsaSsAFBnDSf1LS2Fhn7ycWGC7Yxbv3UftugkuRug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766247364; 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=Zbg6CwOrS2/aCVK7J6QTL+RgqNkTGCI2dpQNNNgzJhA=; b=K69IrFR+kUWLfhIwx8b2r3Q7uLoaNAf1a1KrQeFCSNV2QeZPdZ+FW8L5Ro+V9EQ6lWa9VM 6I7CdS7nF4VN1cD2reqVgjBDE435yU8sfnxqs/wzhlSNPRi3zz6XajAS7mmwQLxBtuOYVt AO2NquOeqCg1GE/7GbyO1As+zhUMfnWrO26EZ0xoDCvvUh16yyEX/fQsM2LfBp8HdnNlfB e/o4nWGYaR01oh2Vm2DjZz98NkXPxmcuUgcS418nkUYlRGl07uHzwvU+N9PhQ2BRSl7oTw kWudhY9fUsETIl7vXWxUc+3m3wlierY8HtJ0gHESyZS93ur0dHN9/q6d6HvJeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766247364; a=rsa-sha256; cv=none; b=v3Xg5QilUpGZ3Bfs5OTxYITfuHGA4webel4JYdetj/A8jKnldFzwgjOdQu78TMFFXaoaJl 1aDbZj5GfZClHFTFHgBgnJUWEGofUor3byHLD3rLPwZ9he3NcvooQzBRE389ctH+SydR3h jAaNTvdoiquyG2PD596bpTXzgq5q7sEzKGDq91UcHEaKx8kl+18VY1njVzoNynU9JP6BTg 4tRGvtdqfOP96e+WyTXfkmdnPru+VG3kALf5r1EF38UbuhxmZXUHfJgy3iPZLsj+QtuWE7 k07on+I98lh7ZQ/Lneat5uy/LJ9b5MQRz1PQOxrpmkXYKP/Ny4KddViarsciSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dYTzS1ltPz11rB for ; Sat, 20 Dec 2025 16:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id de9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Dec 2025 16:16:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: f954e595b21f - stable/15 - tests/ci: Collect environment information List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: f954e595b21fae59395540b0a8296972c979a6ae Auto-Submitted: auto-generated Date: Sat, 20 Dec 2025 16:16:04 +0000 Message-Id: <6946cbc4.de9f.3a93053c@gitrepo.freebsd.org> The branch stable/15 has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=f954e595b21fae59395540b0a8296972c979a6ae commit f954e595b21fae59395540b0a8296972c979a6ae Author: Muhammad Moinur Rahman AuthorDate: 2025-12-16 09:24:55 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-12-20 16:15:51 +0000 tests/ci: Collect environment information For reproducing errors or test results it is important to gather environment information. These environments are divided into two parts. One part is in which environment the artifacts were built into and the second part is in which environment the tests were run. This patch collects thesee information and saves into a .env file in the metadir. After this patch lands we will also need to change our jenkins job where we are uploading the artifact to a central location. This environment file should also be stored along with the artifact. For easier location the image basename and the environment basename are kept same. Approved by: lwhsu MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54247 (cherry picked from commit 14d5c13a89269862b51ef2a7f190b0d28cfbf8a2) --- tests/ci/Makefile | 43 +++++++++++++++++++++++++++++++++++- tests/ci/tools/freebsdci | 57 +++++++++++++++++++++++++++++------------------- 2 files changed, 77 insertions(+), 23 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index 30ca34a810be..a750b1265169 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -82,6 +82,7 @@ KYUA_TEST_FILTERS?= META_TAR!=mktemp /tmp/meta.XXXXXX META_DIR!=mktemp -d /tmp/meta.XXXXXX META_DIROUT!=mktemp -d /tmp/meta.XXXXXX +ENV_FILE= ${META_DIR}/ci-${OSRELEASE}-${GITREV}-${KERNCONF}.env DISC_CAM!=truncate -s 128m /tmp/disk-cam EXTRA_DISK_NUM?=5 DISK_NUMBERS!=jot - 1 ${EXTRA_DISK_NUM} @@ -201,7 +202,47 @@ CITYPE=smoke ci-set-full-var: .PHONY CITYPE=full -ci-create-meta: .PHONY +ci-get-env: .PHONY + @echo "TARGET=${TARGET}" > ${ENV_FILE} + @echo "TARGET_ARCH=${TARGET_ARCH}" >> ${ENV_FILE} + @echo "KERNCONF=${KERNCONF}" >> ${ENV_FILE} + @echo "OSRELEASE=${OSRELEASE}" >> ${ENV_FILE} + @echo "CIIMAGE=${CIIMAGE}" >> ${ENV_FILE} + @echo "CIDISK=${CIDISK}" >> ${ENV_FILE} + @echo "VMSIZE=${VMSIZE}" >> ${ENV_FILE} + @echo "VM_MEM_SIZE=${VM_MEM_SIZE}" >> ${ENV_FILE} + @echo "TIMEOUT=${TIMEOUT}s" >> ${ENV_FILE} + @echo "CITYPE=${CITYPE}" >> ${ENV_FILE} + @echo "KYUA_TEST_FILTERS='${KYUA_TEST_FILTERS}'" >> ${ENV_FILE} + @echo "META_MODE='${METAMODE}'" >> ${ENV_FILE} + @echo "USE_QEMU='${USE_QEMU}'" >> ${ENV_FILE} + @echo "GITREV='${GITREV}'" >> ${ENV_FILE} + @echo "GITBRANCH='${GITBRANCH}'" >> ${ENV_FILE} + @echo "GITCOUNT='${GITCOUNT}'" >> ${ENV_FILE} + @echo "BUILDDATE='${BUILDDATE}'" >> ${ENV_FILE} + @echo "CC='${CC}'" >> ${ENV_FILE} + @echo "CFLAGS='${CFLAGS}'" >> ${ENV_FILE} + @echo "CPP='${CPP}'" >> ${ENV_FILE} + @echo "CXX='${CXX}'" >> ${ENV_FILE} + @echo "CXXFLAGS='${CXXFLAGS}'" >> ${ENV_FILE} + @echo "COMPILER_FEATURES='${COMPILER_FEATURES}'" >> ${ENV_FILE} + @echo "COMPILER_FREEBSD_VERSION='${COMPILER_FREEBSD_VERSION}'" >> ${ENV_FILE} + @echo "COMPILER_TYPE='${COMPILER_TYPE}'" >> ${ENV_FILE} + @echo "COMPILER_VERSION='${COMPILER_VERSION}'" >> ${ENV_FILE} + @echo "HOST_CC='${HOST_CC}'" >> ${ENV_FILE} + @echo "HOST_MACHINE='${HOST_MACHINE}'" >> ${ENV_FILE} + @echo "HOST_OS='${HOST_OS}'" >> ${ENV_FILE} + @echo "HOST_OSMAJOR='${HOST_OSMAJOR}'" >> ${ENV_FILE} + @echo "HOST_OSTYPE='${HOST_OSTYPE}'" >> ${ENV_FILE} + @echo "LD='${LD}'" >> ${ENV_FILE} + @echo "LDFLAGS='${LDFLAGS}'" >> ${ENV_FILE} + @echo "MACHINE='${MACHINE}'" >> ${ENV_FILE} + @echo "MACHINE_ABI='${MACHINE_ABI}'" >> ${ENV_FILE} + @echo "MACHINE_ARCH='${MACHINE_ARCH}'" >> ${ENV_FILE} + @echo "MACHINE_CPU='${MACHINE_CPU}'" >> ${ENV_FILE} + @echo "MACHINE_CPUARCH='${MACHINE_CPUARCH}'" >> ${ENV_FILE} + +ci-create-meta: ci-get-env .PHONY truncate -s 512M ${META_TAR} tar rvf ${META_TAR} -C ${META_DIR} . diff --git a/tests/ci/tools/freebsdci b/tests/ci/tools/freebsdci index 42c565a45055..f71ccc1cad4f 100755 --- a/tests/ci/tools/freebsdci +++ b/tests/ci/tools/freebsdci @@ -57,6 +57,27 @@ auto_shutdown() esac } +set_environment() +{ + if [ "${istar}" -eq 1 ]; then + rm -fr ${metadir} + mkdir -p ${metadir} + tar xvf ${tardev} -C ${metadir} + ci_env_file=$(set -- "${metadir}"/ci-*.env; \ + [ "$#" -eq 1 ] && printf '%s\n' "$1") + if [ -z "${ci_env_file}" ]; then + echo "ci: No CI environment file found in ${metadir}" + else + env >> "${ci_env_file}" + fi + else + echo "ERROR: no device with POSIX tar archive format found." + # Don't shutdown because this is not run in unattended mode + exit 1 + fi + +} + smoke_tests() { echo @@ -72,29 +93,19 @@ full_tests() echo "--------------------------------------------------------------" echo "BOOT sequence COMPLETED" echo "TEST sequence STARTED" - if [ "${istar}" -eq 1 ]; then - rm -fr ${metadir} - mkdir -p ${metadir} - tar xvf ${tardev} -C ${metadir} - cd /usr/tests - set +e - kyua \ - -v parallelism=${parallelism} \ - test ${freebsdci_test_filters} - rc=$? - set -e - if [ ${rc} -ne 0 ] && [ ${rc} -ne 1 ]; then - exit ${rc} - fi - kyua report --verbose --results-filter passed,skipped,xfail,broken,failed --output test-report.txt - kyua report-junit --output=test-report.xml - mv test-report.* /${metadir} - tar cvf ${tardev} -C ${metadir} . - else - echo "ERROR: no device with POSIX tar archive format found." - # Don't shutdown because this is not run in unattended mode - exit 1 + cd /usr/tests + set +e + kyua \ + -v parallelism=${parallelism} \ + test ${freebsdci_test_filters} + rc=$? + set -e + if [ ${rc} -ne 0 ] && [ ${rc} -ne 1 ]; then + exit ${rc} fi + kyua report --verbose --results-filter passed,skipped,xfail,broken,failed --output test-report.txt + kyua report-junit --output=test-report.xml + mv test-report.* /${metadir} echo "TEST sequence COMPLETED" echo "INITIATING system SHUTDOWN" echo "--------------------------------------------------------------" @@ -102,11 +113,13 @@ full_tests() firstboot_ci_run() { + set_environment if [ "$freebsdci_type" = "smoke" ]; then smoke_tests elif [ "$freebsdci_type" = "full" ]; then full_tests fi + tar cvf ${tardev} -C ${metadir} . auto_shutdown }