From 1e29444c8bfb016a1103823517bfa1e34b251b87 Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Tue, 10 Dec 2024 09:21:18 -0500 Subject: [PATCH] tests: Fix flaky ovn-controller - CT zone min/max boundaries. Controller might still be running even after debug/status stops returning "running". Fixes: 8d652c500890 ("controller: Do not remove snat-ct-zone requested by the CMS.") Signed-off-by: Xavier Simonart Signed-off-by: 0-day Robot --- tests/ovn-controller.at | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 96a88626ec..7904cbe378 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -3225,9 +3225,10 @@ AS_BOX([Check LR snat requested zone 2]) AT_CHECK([test $(ovn-appctl -t ovn-controller ct-zone-list | awk '/lr_snat/{print $2}') -eq 2]) n_flush=$(grep -c -i flush hv1/ovs-vswitchd.log) -check ovn-appctl -t ovn-controller exit --restart -# Make sure ovn-controller stopped before restarting it -OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"]) + +# Stop ovn-controller on hv1 with --restart flag +OVN_CONTROLLER_EXIT([hv1]) + start_daemon ovn-controller --verbose="ct_zone:dbg" wait_for_ports_up check ovn-nbctl --wait=hv sync @@ -3244,9 +3245,7 @@ check_ct_zone_max 22 AT_CHECK([test $(ovn-appctl -t ovn-controller ct-zone-list | awk '/lr_snat/{print $2}') -eq 0]) n_flush=$(grep -c -i flush hv1/ovs-vswitchd.log) -check ovn-appctl -t ovn-controller exit --restart -# Make sure ovn-controller stopped before restarting it -OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"]) +OVN_CONTROLLER_EXIT([hv1]) start_daemon ovn-controller --verbose="ct_zone:dbg" wait_for_ports_up check ovn-nbctl --wait=hv sync