diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index ebd30a0..c7dfe02 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -5578,7 +5578,7 @@ index 114aaebc77..c0ecad6cfb 100644 +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index 98e494abf4..3a33707167 100644 +index 98e494abf4..b6de1ed611 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -2359,11 +2359,22 @@ table=20 actions=drop @@ -5950,7 +5950,20 @@ index 98e494abf4..3a33707167 100644 AT_CLEANUP AT_SETUP([conntrack - more complex SNAT]) -@@ -8215,10 +8297,18 @@ table=2,priority=10 ct_state=+trk+est action=drop +@@ -6850,6 +6932,12 @@ dnl Checks the implementation of conntrack with FTP ALGs in combination with + dnl NAT, using the provided flow table. + m4_define([CHECK_FTP_NAT], + [AT_SETUP([conntrack - FTP $1]) ++ m4_if(m4_index([$1], [orig tuple]), -1, [], [ ++ dnl XXX: 6.8.0-1014-azure #16~22.04.1-Ubuntu kernel in GitHub Actions ++ dnl contains a known conntrack bug, but doesn't have a fix for it: ++ dnl a23ac973f67f ("openvswitch: get related ct labels from its master ++ dnl if it is not confirmed") ++ OVS_CHECK_GITHUB_ACTION()]) + AT_SKIP_IF([test $HAVE_FTP = no]) + AT_SKIP_IF([test $HAVE_LFTP = no]) + CHECK_CONNTRACK() +@@ -8215,10 +8303,18 @@ table=2,priority=10 ct_state=+trk+est action=drop AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) @@ -5972,7 +5985,7 @@ index 98e494abf4..3a33707167 100644 sleep 1 -@@ -8389,6 +8479,53 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl +@@ -8389,6 +8485,53 @@ AT_CHECK([ovs-pcap client.pcap | grep 000000002010000000002000], [0], [dnl OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP @@ -6026,7 +6039,7 @@ index 98e494abf4..3a33707167 100644 AT_BANNER([IGMP]) AT_SETUP([IGMP - flood under normal action]) -@@ -8724,21 +8861,29 @@ dnl The flow will encap a nsh header to the TCP syn packet +@@ -8724,21 +8867,29 @@ dnl The flow will encap a nsh header to the TCP syn packet dnl eth/ip/tcp --> OVS --> eth/nsh/eth/ip/tcp AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"]) @@ -6069,7 +6082,7 @@ index 98e494abf4..3a33707167 100644 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP -@@ -8756,19 +8901,31 @@ dnl The flow will decap a nsh header which in turn carries a TCP syn packet +@@ -8756,19 +8907,31 @@ dnl The flow will decap a nsh header which in turn carries a TCP syn packet dnl eth/nsh/eth/ip/tcp --> OVS --> eth/ip/tcp AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1"]) @@ -6111,7 +6124,7 @@ index 98e494abf4..3a33707167 100644 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP -@@ -8788,22 +8945,38 @@ dnl The flow will add another NSH header with nsh_spi=0x101, nsh_si=4, +@@ -8788,22 +8951,38 @@ dnl The flow will add another NSH header with nsh_spi=0x101, nsh_si=4, dnl nsh_ttl=7 and change the md1 context AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"]) @@ -6164,7 +6177,7 @@ index 98e494abf4..3a33707167 100644 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP -@@ -8824,31 +8997,50 @@ dnl packet to to at_ns2. +@@ -8824,31 +9003,50 @@ dnl packet to to at_ns2. AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1"]) AT_CHECK([ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2"]) diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 67503bb..27ef9c7 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 49%{?dist} +Release: 50%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -769,6 +769,12 @@ exit 0 %endif %changelog +* Fri Sep 20 2024 Open vSwitch CI - 3.3.0-50 +- Merging upstream branch-3.3 [RH git: d29ec5b684] + Commit list: + 049d00f683 github: Skip FTP SNAT orig tuple tests due to broken Ubuntu kernel. + + * Mon Sep 16 2024 Open vSwitch CI - 3.3.0-49 - Merging upstream branch-3.3 [RH git: 3713b4e9c9] Commit list: