diff --git a/SPECS/openvswitch/openvswitch.spec b/SPECS/openvswitch/openvswitch.spec index 93420038476..f38558a45da 100644 --- a/SPECS/openvswitch/openvswitch.spec +++ b/SPECS/openvswitch/openvswitch.spec @@ -20,7 +20,7 @@ Summary: Open vSwitch daemon/database/utilities Name: openvswitch Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 AND LGPLv2+ AND SISSL Vendor: Microsoft Corporation Distribution: Azure Linux @@ -304,12 +304,17 @@ pushd $dir %if %{with check} touch resolv.conf export OVS_RESOLV_CONF=$(pwd)/resolv.conf - if make check TESTSUITEFLAGS='%{_smp_mflags}' || - make check TESTSUITEFLAGS='--recheck' || - make check TESTSUITEFLAGS='--recheck'; then :; + # Fast first pass; on retry raise OVS_CTL_TIMEOUT so timing-sensitive + # tests (notably PMD Auto Load Balance) tolerate CPU contention on CI. + if make check TESTSUITEFLAGS='%{_smp_mflags}'; then :; else - cat tests/testsuite.log - exit 1 + export OVS_CTL_TIMEOUT=120 + if make check TESTSUITEFLAGS='--recheck' || + make check TESTSUITEFLAGS='--recheck'; then :; + else + cat tests/testsuite.log + exit 1 + fi fi %endif %if %{with check_datapath_kernel} @@ -505,6 +510,9 @@ fi %{_sysusersdir}/openvswitch.conf %changelog +* Fri May 15 2026 Sumit Jena - 3.3.0-3 +- Make %check more tolerant to CI timing jitter. + * Thu Jan 08 2026 Tobias Brick - 3.3.0-2 - Add patches from fedora f40 to fix tests with new versions of openssl and python. - Update to use correct locations for license files.