Merge ~canonical-kernel-team/+git/autotest-client-tests:jacobmartin/expect-kver-specific-mofed-mods into ~canonical-kernel-team/+git/autotest-client-tests:master

[Jacob Martin]

[Po-Hsu Lin (cypressyew)]

Looking good with just one nit.

review: Needs Fixing

[Jacob Martin (jacobmartin)]

Thanks for the review, I pushed an update to the branch simplifying the kernel version printf.

[Po-Hsu Lin (cypressyew)]

Thanks.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/ubuntu_dgx_mofed_build/check-mofed-modules.sh b/ubuntu_dgx_mofed_build/check-mofed-modules.sh
index 80a2976..8a6613d 100755
--- a/ubuntu_dgx_mofed_build/check-mofed-modules.sh
+++ b/ubuntu_dgx_mofed_build/check-mofed-modules.sh
@@ -12,9 +12,18 @@ printf " %s\n" $release
 printf "INFO: Detecting MOFED driver version..."
 mofedver="$(dpkg-query --showformat='${Version}' --show mlnx-ofed-kernel-only)"
 printf " %s\n" ${mofedver}
-printf "INFO: Detecting Kernel version... %s\n" "$(uname -r)"
+kernelver="$(uname -r)"
+printf "INFO: Detecting Kernel version... %s\n" ${kernelver}
 actual="$(mktemp)"
-expected="$(pwd)/expected-mofed-modules/${mofedver}-${release}.lst"
+
+# First check for a list specific to this major kernel version
+expected="$(pwd)/expected-mofed-modules/${mofedver}-${release}-${kernelver%%-*}.lst"
+if [ ! -f "${expected}" ]; then
+	# Fall back to a general list for this MOFED version & series combination.
+	printf "INFO: No expected module list at '%s', falling back to " "${expected}"
+	expected="$(pwd)/expected-mofed-modules/${mofedver}-${release}.lst"
+	printf "'%s'\n" "${expected}"
+fi
 
 # This test assumes that the only modules installed here are the MOFED ones.
 # If other DKMS packages are installed that will throw it off.
@@ -26,6 +35,8 @@ if [ ! -f ${expected} ]; then
     exit 1
 fi
 
+echo "INFO: Using expected module list file '${expected}'"
+
 if diff -u ${expected} ${actual}; then
     echo "INFO: Success: Actual module list matches expected module list."
     exit 0
diff --git a/ubuntu_dgx_mofed_build/expected-mofed-modules/23.10-1.1.9.0-jammy-6.5.0.lst b/ubuntu_dgx_mofed_build/expected-mofed-modules/23.10-1.1.9.0-jammy-6.5.0.lst
new file mode 100644
index 0000000..a7f6bc8
--- /dev/null
+++ b/ubuntu_dgx_mofed_build/expected-mofed-modules/23.10-1.1.9.0-jammy-6.5.0.lst
@@ -0,0 +1,23 @@
+ib_cm.ko
+ib_core.ko
+ib_ipoib.ko
+ib_iser.ko
+ib_isert.ko
+ib_srp.ko
+ib_umad.ko
+ib_uverbs.ko
+irdma.ko
+iw_cm.ko
+knem.ko
+mlx5-vfio-pci.ko
+mlx5_core.ko
+mlx5_ib.ko
+mlx5_vdpa.ko
+mlx_compat.ko
+mlxdevm.ko
+mlxfw.ko
+mst_pci.ko
+mst_pciconf.ko
+rdma_cm.ko
+rdma_ucm.ko
+scsi_transport_srp.ko