diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 6f2f7f5..8741dc9 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -93361,7 +93361,7 @@ index 0000000000..1714273e35 +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index 4a39c929c2..b5097f2ac3 100644 +index 4a39c929c2..7aee998efa 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -574,6 +574,60 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI @@ -93732,6 +93732,15 @@ index 4a39c929c2..b5097f2ac3 100644 AT_SETUP([conntrack - more complex DNAT]) CHECK_CONNTRACK() CHECK_CONNTRACK_NAT() +@@ -5628,7 +5947,7 @@ on_exit 'ovs-appctl revalidator/purge' + on_exit 'ovs-appctl dpif/dump-flows br0' + + dnl Should work with the virtual IP address through NAT +-for i in 1 2 3 4 5 6 7 8 9 10 11 12; do ++for i in $(seq 1 50); do + echo Request $i + NS_CHECK_EXEC([at_ns1], [wget 10.1.1.64 -t 5 -T 1 --retry-connrefused -v -o wget$i.log]) + done @@ -5873,6 +6192,50 @@ ovs-appctl dpif/dump-flows br0 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 7cf7f39..2c32f1f 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 168%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 169%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Fri Mar 25 2022 Open vSwitch CI - 2.13.0-169 +- Merging upstream branch-2.13 [RH git: 81f1610a56] + Commit list: + 5d8e080115 system-traffic.at: Fix flaky DNAT load balancing test. + + * Mon Mar 21 2022 Open vSwitch CI - 2.13.0-168 - Merging upstream branch-2.13 [RH git: a43ac9e3c0] Commit list: