git: ad9b27e097b1 - main - tests/ci: style: canonicalize, sort, and multiline kmods/pkgs

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/src/commit/?id=ad9b27e097b1b69b16a41d8ae10734750e5cff5c

commit ad9b27e097b1b69b16a41d8ae10734750e5cff5c
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-08-13 20:40:02 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
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 <me@svmhdvn.name>
    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"