Hi Frode, Ales, Ilya, On 3/31/25 12:17 PM, Frode Nordahl wrote: > On 31.03.2025 11:57, Ilya Maximets wrote: >> On 3/31/25 11:51 AM, Dumitru Ceara wrote: >>> On 3/31/25 10:56 AM, Ilya Maximets wrote: >>>> On 3/31/25 8:57 AM, Frode Nordahl wrote: >>>>> Building the OVS submodule is currently broken for the OVN CI due >>>>> to a change in flake8 2.7.0 which introduced the F824 check [0][1]. >>>>> >>>>> This was tackled in OVS commit 7f4ee4395637 by disabling the check. >>>>> >>>>> 0: PyCQA/flake8#1974 >>>>> 1: PyCQA/pyflakes#825 >>>>> Signed-off-by: Frode Nordahl <[email protected]> >>>>> --- >>>>> ovs | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>> >>>>> diff --git a/ovs b/ovs >>>>> index 400db9746..7f4ee4395 160000 >>>>> --- a/ovs >>>>> +++ b/ovs >>>>> @@ -1 +1 @@ >>>>> -Subproject commit 400db974617abe5330a726c2c1e15f9a9efd849a >>>>> +Subproject commit 7f4ee4395637e906563c71f4112b809fed4f3968 >>>> >>>> We shouldn't move to the main branch here. OVN main is currently on >>>> the >>>> branch-3.5, so we should move to the corresponding commit from that >>>> branch >>>> instead: bb059333496a9b48d6d798b6b32108c9f2720479. >>>> >>>> OVS' main branch contains a re changes like removal of deprecated >>>> SSL/TLS >>>> versions and STT tunnel support. This will need corresponding OVN >>>> changes >>>> in the documentation and the code. These are work in progress. >>>> So, while it may not be a big deal to move now and fix OVN later, I >>>> think, >>>> it's better to consume those changes together with making corresponding >>>> OVN changes. There is no reason to move to OVS main just now. > > Ack, I started out with updating to tip of branch-3.5, but then thought > this is > OVN's main branch, so let's use OVS main branch. But I did not consider > whether > there were additional pending work to allow that. Thank you for pointing > it out! > >>>> The commit name should also be a bit more descriptive, e.g.: >>>> >>>> "ovs: Update the submodule to include python F824 fix." >>>> >>>> >>> >>> I can take care of all of this (bump to latest 3.5/latest 3.x on stable >>> branches and rewording the commit name. Frode, Ilya, Ales, does that >>> sound OK to you? >> >> Sounds fine to me. > > Feel free! That will allow me to continue on fixing > https://bugs.launchpad.net/ubuntu/+source/ovn/+bug/2104222, it is > essentially a > change of behavior in scapy 2.6.x that needs to be addressed in our test > code, > hopefully have patches on the list some time today. >
I made the changes suggested by Ilya and applied the patch to main. I also cherry-picked it to 25.03, 24.09, 24.03 changing the OVS branch to the corresponding latest OVS 3.x version. Looking forward to the scapy related test fixes. Thanks a lot for taking care of our CI! Regards, Dumitru > -- > Frode Nordahl > >> Best regards, Ilya Maximets. >> >>> >>> Thanks, >>> Dumitru >>> >>>> Best regards, Ilya Maximets. >>>> >>> >> > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
