From 5ee8323aa7e8a7aa922a8aea1487c9ecebbc0158 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sat, 16 Sep 2023 21:00:35 -0400 Subject: [PATCH] LU-17096 debian: add obd_test.ko, llog_test.ko to lustre-tests The obd_test.ko module was missing from the lustre-tests Debian package. Hence, it wasn't being installed on the Ubuntu clients during testing. This caused sanity/55a and sanity/55b to consistently fail. Add llog_test.ko to lustre-tests also. It's not unheard of to use Ubuntu for Lustre server. So the package may as well include llog_test.ko. Also, update debian/.gitignore. Test-Parameters: trivial testlist=sanity env=ONLY=55,ONLY_REPEAT=50 clientdistro=ubuntu2204 Test-Parameters: trivial testlist=sanity env=ONLY=55,ONLY_REPEAT=50 Signed-off-by: Timothy Day Change-Id: I050de4563478996828886ca623fa96b58f9fef5e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52398 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Thomas Stibor Reviewed-by: Andreas Dilger --- autoMakefile.am | 2 ++ debian/.gitignore | 2 ++ debian/{lustre-tests.install => lustre-tests.install.in} | 1 + 3 files changed, 5 insertions(+) rename debian/{lustre-tests.install => lustre-tests.install.in} (58%) diff --git a/autoMakefile.am b/autoMakefile.am index ce125f0..ceabe62 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -452,6 +452,8 @@ debs: undef.h debs_common export IB_OPTIONS="--with-o2ib=yes"; \ fi; \ fi; \ + sed "s/_KVERS_/$(LINUXRELEASE)/g" debian/lustre-tests.install.in \ + > debian/lustre-tests.install; \ dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \ rc=$${PIPESTATUS[0]}; \ cp $$debiantmp/control.bkp debian/control || true && \ diff --git a/debian/.gitignore b/debian/.gitignore index 1a5c37b..e9c103e 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,7 @@ /*.log /*.substvars /.debhelper +/changelog /files /lustre-dev /lustre-source @@ -11,4 +12,5 @@ /lustre-*-utils /lustre-server-utils.install /lustre-client-utils.install +/lustre-tests.install /tmp diff --git a/debian/lustre-tests.install b/debian/lustre-tests.install.in similarity index 58% rename from debian/lustre-tests.install rename to debian/lustre-tests.install.in index e90eafe..ad47368 100644 --- a/debian/lustre-tests.install +++ b/debian/lustre-tests.install.in @@ -1,3 +1,4 @@ +debian/tmp/lib/modules/_KVERS_/updates/kernel/fs/lustre/*_test.ko usr/lib/modules/_KVERS_/updates/kernel/fs/lustre/ debian/tmp/usr/lib/lustre/tests/* usr/lib/lustre/tests debian/tmp/usr/bin/mcreate usr/bin debian/tmp/usr/bin/statx usr/bin -- 1.8.3.1