[ovn][source-main] job fails with error: too many arguments to function mcast_snooping_add_group4

[yatin]

Fails as:-
2024-01-31 03:02:06.467122 | controller | controller/pinctrl.c: In function ‘pinctrl_ip_mcast_handle_igmp’:
2024-01-31 03:02:06.468027 | controller | controller/pinctrl.c:5478:54: error: ‘MCAST_GROUP_IGMPV1’ undeclared (first use in this function)
2024-01-31 03:02:06.468683 | controller | 5478 | port_key_data, MCAST_GROUP_IGMPV1);
2024-01-31 03:02:06.469444 | controller | | ^~~~~~~~~~~~~~~~~~
2024-01-31 03:02:06.469472 | controller | controller/pinctrl.c:5478:54: note: each undeclared identifier is reported only once for each function it appears in
2024-01-31 03:02:06.469493 | controller | controller/pinctrl.c:5477:13: error: too many arguments to function ‘mcast_snooping_add_group4’
2024-01-31 03:02:06.469774 | controller | 5477 | mcast_snooping_add_group4(ip_ms->ms, ip4, IP_MCAST_VLAN,
2024-01-31 03:02:06.469799 | controller | | ^~~~~~~~~~~~~~~~~~~~~~~~~
2024-01-31 03:02:06.469821 | controller | In file included from controller/ip-mcast.h:19,
2024-01-31 03:02:06.502161 | controller | from controller/pinctrl.c:64:
2024-01-31 03:02:06.502217 | controller | /opt/stack/ovs/lib/mcast-snooping.h:190:6: note: declared here
2024-01-31 03:02:06.502255 | controller | 190 | bool mcast_snooping_add_group4(struct mcast_snooping *ms, ovs_be32 ip4,
2024-01-31 03:02:06.502286 | controller | | ^~~~~~~~~~~~~~~~~~~~~~~~~
2024-01-31 03:02:06.502324 | controller | controller/pinctrl.c:5483:54: error: ‘MCAST_GROUP_IGMPV2’ undeclared (first use in this function)
2024-01-31 03:02:06.503464 | controller | 5483 | port_key_data, MCAST_GROUP_IGMPV2);
2024-01-31 03:02:06.503491 | controller | | ^~~~~~~~~~~~~~~~~~
2024-01-31 03:02:06.503513 | controller | depbase=`echo controller/local_data.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
2024-01-31 03:02:06.503936 | controller | gcc -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./ovn -I ./include -I ./lib -I ./lib -I /opt/stack/ovs/include -I /opt/stack/ovs/include -I /opt/stack/ovs/lib -I /opt/stack/ovs/lib -I /opt/stack/ovs -I /opt/stack/ovs -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wbool-compare -Wshift-negative-value -Wduplicated-cond -Wshadow -Wmultistatement-macros -Wcast-align=strict -g -O2 -MT controller/local_data.o -MD -MP -MF $depbase.Tpo -c -o controller/local_data.o controller/local_data.c &&\
2024-01-31 03:02:06.503963 | controller | mv -f $depbase.Tpo $depbase.Po
2024-01-31 03:02:06.504000 | controller | controller/pinctrl.c:5482:13: error: too many arguments to function ‘mcast_snooping_add_group4’
2024-01-31 03:02:06.504288 | controller | 5482 | mcast_snooping_add_group4(ip_ms->ms, ip4, IP_MCAST_VLAN,
2024-01-31 03:02:06.504314 | controller | | ^~~~~~~~~~~~~~~~~~~~~~~~~
2024-01-31 03:02:06.504335 | controller | In file included from controller/ip-mcast.h:19,

Example failure:- https://storage.gra.cloud.ovh.net/v1/AUTH_dcaab5e32b234d56b626f72581e3644c/zuul_opendev_logs_3c5/periodic/opendev.org/openstack/neutron/master/neutron-ovn-tempest-ipv6-only-ovs-master/3c5404e/job-output.txt

Failing since https://github.com/ovn-org/ovn/commit/dc34b4d9f7f3efb4e7547f9850f6086a7e1a2338
need to update OVS_BRANCH

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/neutron/+/907320

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/neutron/+/907320
Committed: https://opendev.org/openstack/neutron/commit/5b49c507ba493db1f624b64bf63d7126dc40d4a4
Submitter: "Zuul (22348)"
Branch: master

commit 5b49c507ba493db1f624b64bf63d7126dc40d4a4
Author: yatinkarel <email address hidden>
Date: Wed Jan 31 18:54:08 2024 +0530

    [OVN][CI] Update OVS_BRANCH to be compatible with ovn main

    Required since [1].

    [1] https://github.com/ovn-org/ovn/commit/dc34b4d9

    Closes-Bug: #2051845
    Change-Id: If1744f0f3d9905ccbe920581c9f39774ce5d7517

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 24.0.0.0rc1 release candidate.