diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index b898ca8..c7e4dbe 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -12,10 +12,26 @@ index e1b8e3ccbb..991b272ea1 100755 # OVS depends on the vhost library (and its dependencies). # net/tap depends on the gso library. diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh -index 2a191b57fb..5f8a1db6af 100755 +index 2a191b57fb..51e5a7e7dd 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh -@@ -23,7 +23,7 @@ cd .. +@@ -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 +@@ -23,7 +24,7 @@ cd .. # https://github.com/pypa/pip/issues/10655 pip3 install --disable-pip-version-check --user wheel pip3 install --disable-pip-version-check --user \ @@ -46,7 +62,7 @@ index d73154a971..9f0fbfe40d 100644 matrix: COMPILER: gcc diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index 9d3a13ca1c..64da992295 100644 +index 9d3a13ca1c..e6dd92c1e9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -7,15 +7,18 @@ env: @@ -187,7 +203,7 @@ index 9d3a13ca1c..64da992295 100644 - name: install libunbound libunwind python3-unbound # GitHub Actions doesn't have 32-bit versions of these libraries. if: matrix.m32 == '' -@@ -241,14 +306,6 @@ jobs: +@@ -241,13 +306,12 @@ jobs: if: matrix.m32 != '' run: sudo apt install -y gcc-multilib @@ -198,11 +214,16 @@ index 9d3a13ca1c..64da992295 100644 - # runners are using leading to random crashes: - # https://github.com/actions/runner-images/issues/9491 - run: sudo sysctl -w vm.mmap_rnd_bits=28 -- ++ - 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 - -@@ -275,17 +332,20 @@ jobs: +@@ -275,17 +339,20 @@ jobs: name: logs-linux-${{ join(matrix.*, '-') }} path: logs.tgz @@ -228,7 +249,7 @@ index 9d3a13ca1c..64da992295 100644 timeout-minutes: 30 steps: -@@ -355,35 +415,86 @@ jobs: +@@ -355,35 +422,86 @@ jobs: key: ${{ steps.cache_key.outputs.key }} - name: set up python @@ -319,7 +340,7 @@ index 9d3a13ca1c..64da992295 100644 - name: build run: ./.ci/linux-build.sh -@@ -432,7 +543,7 @@ jobs: +@@ -432,7 +550,7 @@ jobs: DPDK: ${{ matrix.dpdk }} name: linux deb ${{ matrix.dpdk }} dpdk @@ -328,7 +349,7 @@ index 9d3a13ca1c..64da992295 100644 timeout-minutes: 30 strategy: -@@ -473,7 +584,7 @@ jobs: +@@ -473,7 +591,7 @@ jobs: build-linux-rpm: name: linux rpm fedora runs-on: ubuntu-latest @@ -3866,7 +3887,7 @@ index 3d84a53182..03ec01270f 100644 OVS_TRAFFIC_VSWITCHD_STOP(["/.*ethtool command ETHTOOL_G.*/d"]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index 202ff04922..6cb1a75b12 100644 +index 202ff04922..d322199e5c 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -38,7 +38,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING], [0], @@ -4921,6 +4942,28 @@ index 202ff04922..6cb1a75b12 100644 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.1,sport=,dport=),zone=1,protoinfo=(state=) +@@ -6960,6 +7324,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 +@@ -6976,10 +7344,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 @@ -7347,7 +7711,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.2 >/dev/null]) OVS_START_L7([at_ns1], [ftp]) diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 10892a2..8e2c0f1 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.2 -Release: 55%{?dist} +Release: 56%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -787,6 +787,13 @@ exit 0 %endif %changelog +* Thu Mar 13 2025 Open vSwitch CI - 3.4.0-56 +- Merging upstream branch-3.4 [RH git: 8feef886ea] + Commit list: + 9285574887 tests: Fix 'ICMP related with SNAT' test case in offload scenario. + 2ebc68225c github: Get sparse from the official GitHub mirror. + + * Fri Feb 28 2025 Open vSwitch CI - 3.4.0-55 - Merging upstream branch-3.4 [RH git: 682d47e755] Commit list: