diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 38fcfe4..132c27a 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,6 +1,6 @@ Name: device-mapper-multipath Version: 0.9.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tools to manage multipath devices using device-mapper License: GPLv2 URL: http://christophe.varoqui.free.fr/ @@ -233,6 +233,9 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Fri Jun 28 2024 Benjamin Marzinski - 0.9.7-10 +- Fix CI tests + * Mon Jun 24 2024 Benjamin Marzinski - 0.9.7-9 - Add gating.yaml diff --git a/tests/bindings/main.sh b/tests/bindings/main.sh index 2d6f284..37ceded 100755 --- a/tests/bindings/main.sh +++ b/tests/bindings/main.sh @@ -33,7 +33,7 @@ sleep 5 terr "modprobe -r scsi_debug" terr "modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20 \ max_luns=2 no_lun_0=1" -sleep 60 +sleep 5 disk_path=$(get_scsi_debug_devices) disk=$(basename $disk_path) diff --git a/tests/find_multipaths/main.sh b/tests/find_multipaths/main.sh index 4d94c87..b857787 100755 --- a/tests/find_multipaths/main.sh +++ b/tests/find_multipaths/main.sh @@ -101,7 +101,7 @@ trun "modprobe -r scsi_debug" # test find_multipaths=y create device for paths have same wwid tok "modprobe scsi_debug num_tgts=1 vpd_use_hostno=0 add_host=2 delay=20 max_luns=2 no_lun_0=1" -sleep 10 +sleep 5 disk_paths=$(get_scsi_debug_devices) disk_node=$(basename $disk_paths) mpath_name=$(get_mpath_disk_by_scsi_device $disk_node) diff --git a/tests/restate_module/main.sh b/tests/restate_module/main.sh index 565e59c..be60eba 100755 --- a/tests/restate_module/main.sh +++ b/tests/restate_module/main.sh @@ -48,10 +48,8 @@ rpm -q device-mapper-multipath || yum install -y device-mapper-multipath tlog "device-mapper-multipath is installed" # cleanup existing devices trun "rm /etc/multipath.conf" -trun "mpathconf --enable --with_module y" -sed -i '/^defaults[[:space:]]*{/ a\ - max_polling_interval 10 -' /etc/multipath.conf +trun "mpathconf --enable --with_module y --option max_polling_interval:10" +trun "mpathconf --option detect_pgpolicy_use_tpg:yes" trun "service multipathd stop" trun "multipath -F" sleep 5