If one of the permutations failed, others running after that would also fail because of leftover dhcpd running. Make sure that dhcpd is killed if it's still running since previous test.
Reported-at: https://bugzilla.redhat.com/2108726 Signed-off-by: Ales Musil <[email protected]> --- tests/system-ovn.at | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 066eab19b..de1652eee 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -5270,6 +5270,16 @@ ovn-nbctl set logical_router_port rp-public options:prefix=true ovn-nbctl set logical_router_port rp-sw0 options:prefix=true ovn-nbctl set logical_router_port rp-sw1 options:prefix=true +OVN_POPULATE_ARP + +ovn-nbctl --wait=hv sync + +dhcpd_pid=$(pidof dhcpd) +if $(test "$dhcpd_pid" != "") ; then + echo "Leftover dhcpd was running!"; + kill -9 $dhcpd_pid +fi + cat > /etc/dhcp/dhcpd.conf <<EOF option dhcp-rebinding-time 15; option dhcp-renewal-time 10; @@ -5320,7 +5330,7 @@ OVS_WAIT_UNTIL([ test "${total_pkts}" = "1" ]) -kill $(pidof dhcpd) +kill -9 $(pidof dhcpd) kill $(pidof tcpdump) ovn-nbctl set logical_router_port rp-sw0 options:prefix=false -- 2.35.3 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
