From nobody Wed Aug 13 21:02:24 2025 X-Original-To: dev-commits-src-all@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 4c2LRP4Hp9z64WMy; Wed, 13 Aug 2025 21:02:25 +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 4c2LRN6DV5z3VGs; Wed, 13 Aug 2025 21:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755118944; 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=h/IhbdVqxKf9YJed9qJUNenTrolISI1Ve8C2yE12sS4=; b=JOU73ujmoGXH35H9Tnmm3b68YXvaDf1KJhlSOO2Qla8dE4Jkujp7INS0oh1jtGOHtaReYL GLoDst6oB+14LGxWWATEUnNRaWxr4u0/rXGultcMpwcheVjhDgVl98E7JIaFECA2qS5oLD /8PHytrycqiPeTOGYNkSb5zhAu1CwDC4yeZckLv+z2WeoFyabXgdKn2Dm2Ygaux1EhCbmx RaDGa9Nxg22Tj6gHUP2H5fMWG8JfUGPvNpDQKSo7740g1c3Ru4bpgPQp5esYNvV8/LDJIq NqbsOaYxcDXdSXcTaO7NNFNmQx2QcnHhiBDC8UBR5FTjEipooOw1pWFyVbhYsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755118944; 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=h/IhbdVqxKf9YJed9qJUNenTrolISI1Ve8C2yE12sS4=; b=rmQ7MF1uT0Elr7dwkOfc/F+7wAIBIMfDoSGuRmOjn72ivtLjXeTJ8wPyA3Vag8b2iH7kPS 2Qj6DYqqzYTOksabHA44za2EH0QJQysvPeP5sjuD/zUpxt/ooej4Q3Kkk3xbsO8WIWWg3z WTllF/jBPqxzl+PMzpaXHtq3PBRz4YLFl2S8NaAohp1g/ULp7XCldiyMHIg4iuh/aHJ89a UP1qjaHVwnCe+zuVFtcWxa74vQChlYCay5byRfH0xmsnVKNp4nWJbjfnqGMkJ10uYezRyT 8YBVTMwyDcp9QA3rq0fPMr/UFXW/Nuk4JVd8smNDQ5kA5vPmwyKONkzWygE0Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755118944; a=rsa-sha256; cv=none; b=sFdJBYPR4XO7GEiQ54zt03n9/o0DF/AcQty+/84O/VaCtNOTTwa1uP44d5isL3ncNU08sJ 9yigzP+y5gS9hVzrvpSqgSmJt6BgHk/qIv41rjZCnr0J4GCs1AkgOowZVcqPSriorOaZMF nJmUn60bH9xSpwuaRskaKA7yOsfWXiUa5alvApiN/VKlCYWdmsUsx/nUbSabVleUiD5OiJ K4+gG+onMp+/niVonRLN1qneuPsFUavnYy3eOuQmW9ffrjBkTnE9PHWJa5gwXEBLefeuSa i3jL4B5tsop71iQZueCk2pSbYD0hD7+ytGYkeHn2eSYBM+4e9ys8Vn18j7alJQ== 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 4c2LRN5rCDz7hP; Wed, 13 Aug 2025 21:02:24 +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 57DL2OHv031866; Wed, 13 Aug 2025 21:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DL2Ocm031863; Wed, 13 Aug 2025 21:02:24 GMT (envelope-from git) Date: Wed, 13 Aug 2025 21:02:24 GMT Message-Id: <202508132102.57DL2Ocm031863@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: ad9b27e097b1 - main - tests/ci: style: canonicalize, sort, and multiline kmods/pkgs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ad9b27e097b1b69b16a41d8ae10734750e5cff5c Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9b27e097b1b69b16a41d8ae10734750e5cff5c commit ad9b27e097b1b69b16a41d8ae10734750e5cff5c Author: Siva Mahadevan AuthorDate: 2025-08-13 20:40:02 +0000 Commit: Li-Wen Hsu CommitDate: 2025-08-13 21:01:26 +0000 tests/ci: style: canonicalize, sort, and multiline kmods/pkgs This helps to remove ambiguity and reduce future diffs of changes to the VM_EXTRA_PACKAGES list. Also sort kld_list. Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51308 --- tests/ci/tools/ci.conf | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/ci/tools/ci.conf b/tests/ci/tools/ci.conf index 9db0819498ab..63ede1fd1883 100644 --- a/tests/ci/tools/ci.conf +++ b/tests/ci/tools/ci.conf @@ -11,10 +11,26 @@ export VM_RC_LIST="auditd freebsdci" if [ "${CITYPE}" != "smoke" ]; then -export VM_EXTRA_PACKAGES="coreutils devel/py-pytest gdb jq ksh93 net/py-dpkt net/scapy nist-kat nmap perl5 python python3 sudo sysutils/porch tcptestsuite" +export VM_EXTRA_PACKAGES=" +devel/gdb +devel/py-pytest +perl5 +lang/python +lang/python3 +net/py-dpkt +net/scapy +net/tcptestsuite +security/nist-kat +security/nmap +security/sudo +shells/ksh93 +sysutils/coreutils +sysutils/porch +textproc/jq +" if [ "${TARGET}" = "amd64" ]; then - export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} linux-c7-ltp" + export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} devel/linux-ltp" fi fi @@ -40,21 +56,21 @@ EOF cat << EOF >> ${DESTDIR}/etc/rc.conf kld_list="" # Load modules needed by tests kld_list="\${kld_list} blake2" # sys/opencrypto +kld_list="\${kld_list} carp" # sys/netinet/carp kld_list="\${kld_list} cryptodev" # sys/opencrypto kld_list="\${kld_list} dummymbuf" # sys/netpfil +kld_list="\${kld_list} dummynet" # sys/netpfil/common kld_list="\${kld_list} fusefs" # sys/fs/fusefs +kld_list="\${kld_list} if_stf" # sys/net/if_stf +kld_list="\${kld_list} ipdivert" # sys/netinet (loads ipdivert) +kld_list="\${kld_list} ipfw" # sys/netpfil/ipfw (loads ipfw) +kld_list="\${kld_list} ipfw_nat" # sys/netpfil/ipfw (loads ipfw_nat) +kld_list="\${kld_list} ipl" # sys/sbin/ipf (loads ipfilter) kld_list="\${kld_list} ipsec" # sys/netipsec kld_list="\${kld_list} mac_portacl" # sys/mac/portacl -kld_list="\${kld_list} mqueuefs" # sys/kern/mqueue_test -kld_list="\${kld_list} pfsync" # sys/netpfil/pf (loads pf) +kld_list="\${kld_list} mqueuefs" # sys/kern/mqueue_test kld_list="\${kld_list} pflog" # sys/netpfil/pf -kld_list="\${kld_list} ipl" # sys/sbin/ipf (loads ipfilter) -kld_list="\${kld_list} ipfw" # sys/netpfil/ipfw (loads ipfw) -kld_list="\${kld_list} ipfw_nat" # sys/netpfil/ipfw (loads ipfw_nat) -kld_list="\${kld_list} ipdivert" # sys/netinet (loads ipdivert) -kld_list="\${kld_list} dummynet" # sys/netpfil/common -kld_list="\${kld_list} carp" # sys/netinet/carp -kld_list="\${kld_list} if_stf" # sys/net/if_stf +kld_list="\${kld_list} pfsync" # sys/netpfil/pf (loads pf) background_fsck="NO" sendmail_enable="NONE" cron_enable="NO"