diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch index f9324d6..4d8e809 100644 --- a/SOURCES/openvswitch-3.5.0.patch +++ b/SOURCES/openvswitch-3.5.0.patch @@ -1,3 +1,41 @@ +diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh +index 5f8a1db6af..51e5a7e7dd 100755 +--- a/.ci/linux-prepare.sh ++++ b/.ci/linux-prepare.sh +@@ -12,10 +12,11 @@ fi + # + # Disabling sqlite support because sindex build fails and we don't + # really need this utility being installed. +-git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git +-cd sparse +-make -j4 HAVE_SQLITE= install +-cd .. ++if test -d sparse; then ++ pushd sparse ++ make -j4 HAVE_SQLITE= install ++ popd ++fi + + # Installing wheel separately because it may be needed to build some + # of the packages during dependency backtracking and pip >= 22.0 will +diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml +index d90b9273a6..cea15fbb52 100644 +--- a/.github/workflows/build-and-test.yml ++++ b/.github/workflows/build-and-test.yml +@@ -306,6 +306,13 @@ jobs: + if: matrix.m32 != '' + run: sudo apt install -y gcc-multilib + ++ - name: checkout sparse ++ uses: actions/checkout@v4 ++ # Official mirror of the git.kernel.org/pub/scm/devel/sparse/sparse.git. ++ with: ++ repository: lucvoo/sparse ++ path: sparse ++ + - name: prepare + run: ./.ci/linux-prepare.sh + diff --git a/NEWS b/NEWS index 2e5356c5cd..c670cf8f35 100644 --- a/NEWS @@ -128,6 +166,32 @@ index f9f79f1941..bac6bf2764 100644 OVSDB_CHECK_IDL_PY([simple idl, python, add_op], [], +diff --git a/tests/system-traffic.at b/tests/system-traffic.at +index 0215453230..f2d3552808 100644 +--- a/tests/system-traffic.at ++++ b/tests/system-traffic.at +@@ -7590,6 +7590,10 @@ dnl Solicit another "destination unreachable" response. + dnl To verify that after flushing, the same openflow rules are matched. + NS_CHECK_EXEC([at_ns0], [bash -c "echo a | nc $NC_EOF_OPT -u 10.1.1.2 10000"]) + ++AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl ++udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=) ++]) ++ + AT_CHECK([ovs-appctl revalidator/purge], [0]) + AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_bytes | sort | grep -v drop], [0], [dnl + n_packets=1, priority=10,arp actions=NORMAL +@@ -7606,10 +7610,6 @@ AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_byt + OFPST_FLOW reply (OF1.5): + ]) + +-AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl +-udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=) +-]) +- + AT_CHECK([tcpdump -n -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) + + OVS_TRAFFIC_VSWITCHD_STOP diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 710341b655..8011850fdf 100644 --- a/tests/test-ovsdb.c diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec index 6d2f153..667ec8d 100644 --- a/SPECS/openvswitch3.5.spec +++ b/SPECS/openvswitch3.5.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.5.0 -Release: 7%{?dist} +Release: 8%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -788,6 +788,13 @@ exit 0 %endif %changelog +* Thu Mar 13 2025 Open vSwitch CI - 3.5.0-8 +- Merging upstream branch-3.5 [RH git: dca622cc8b] + Commit list: + 59a155c931 tests: Fix 'ICMP related with SNAT' test case in offload scenario. + d7536101fd github: Get sparse from the official GitHub mirror. + + * Fri Feb 28 2025 Open vSwitch CI - 3.5.0-7 - Merging upstream branch-3.5 [RH git: 66800bd643] Commit list: