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

[yatin]

Fails as:-
2024-01-16 03:02:53.651183 | 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/ovn-controller.o -MD -MP -MF $depbase.Tpo -c -o controller/ovn-controller.o controller/ovn-controller.c &&\
2024-01-16 03:02:53.651243 | controller | mv -f $depbase.Tpo $depbase.Po
2024-01-16 03:02:53.651272 | controller | controller/ofctrl.c: In function ‘ofctrl_inject_pkt’:
2024-01-16 03:02:53.651946 | controller | controller/ofctrl.c:3048:5: error: too many arguments to function ‘flow_compose’
2024-01-16 03:02:53.652293 | controller | 3048 | flow_compose(&packet, &uflow, NULL, 64, false);
2024-01-16 03:02:53.652320 | controller | | ^~~~~~~~~~~~
2024-01-16 03:02:53.652342 | controller | In file included from /opt/stack/ovs/lib/dp-packet.h:34,
2024-01-16 03:02:53.682892 | controller | from controller/ofctrl.c:21:
2024-01-16 03:02:53.682967 | controller | /opt/stack/ovs/lib/flow.h:129:6: note: declared here
2024-01-16 03:02:53.682996 | controller | 129 | void flow_compose(struct dp_packet *, const struct flow *,
2024-01-16 03:02:53.683024 | controller | | ^~~~~~~~~~~~
2024-01-16 03:02:53.683059 | controller | make[1]: *** [Makefile:2325: controller/ofctrl.o] Error 1
2024-01-16 03:03:02.115087 | controller | make[1]: *** Waiting for unfinished jobs....
2024-01-16 03:03:02.115190 | controller | make[1]: Leaving directory '/opt/stack/ovn'
2024-01-16 03:03:02.115584 | controller | make: *** [Makefile:1505: all] Error 2
2024-01-16 03:03:02.120930 | controller | + lib/neutron_plugins/ovn_agent:compile_ovn:1 : exit_trap

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

builds:-
https://zuul.openstack.org/builds?job_name=neutron-ovn-tempest-ipv6-only-ovs-master&job_name=neutron-ovn-tempest-ovs-master-centos-9-stream&skip=0

Broken since https://github.com/ovn-org/ovn/commit/66ef6709678486f7abf88db10eed15fb72edcc4a, need to update OVS_BRANCH in these jobs.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/neutron/+/905645
Committed: https://opendev.org/openstack/neutron/commit/70f9dd926f7433569df59c2f309f4239b8e8e7c9
Submitter: "Zuul (22348)"
Branch: master

commit 70f9dd926f7433569df59c2f309f4239b8e8e7c9
Author: yatinkarel <email address hidden>
Date: Tue Jan 16 13:03:47 2024 +0530

    update OVS_BRANCH to be compatible with ovn main branch

    Required since [1] included in ovn repo.

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

    Closes-Bug: #2049488
    Change-Id: Ia50937dd81a33da8297576e91aa69e1897899529

[OpenStack Infra (hudson-openstack)]

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