On Tue, Feb 4, 2025 at 3:39 PM Mark Michelson <mmich...@redhat.com> wrote: > > Hi Numan, > > Thanks for the updated patch. > > Acked-by: Mark Michelson <mmich...@redhat.com>
Thanks Mark. I applied this patch to main after adding the below changes. --- diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile index caaa41708c..b34cdbea1f 100644 --- a/.ci/ovn-kubernetes/Dockerfile +++ b/.ci/ovn-kubernetes/Dockerfile @@ -81,6 +81,8 @@ COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/noarch/*rpm ./ # Delete network-scripts-openvswitch rpm generated earlier as it requires # network-scripts package and it is no longer available from Fedora 41. +# TODO: Remove the below deletion of network-scripts rpm Once we move +# our ovs submodule to this commit - ed133507f0c12e RUN rm -f network-scripts* RUN dnf install -y *.rpm && rm -f *.rpm ----- Once we move ovs submodule to have this commit https://github.com/openvswitch/ovs/commit/ed133507f0c12e182cd275aff18f58425eb511d1 we don't need to delete the networks-scripts rpm. I tried including that ovs submodule, but the ovs-dpdk job failed [1] Looks like OVS compilation is failing on Fedora 41 with dpdk enabled. I couldn't debug that issue. So I went ahead and applied this patch. Numan [1] - https://github.com/numansiddique/ovn/actions/runs/13183104652/job/36798831741 * If someone wants to take a look at this issue. libtool: compile: env REAL_CC=gcc "CHECK=sparse -Wsparse-error -I ./include/sparse -I ./include -m64 -I /usr/local/include -I /usr/include/x86_64-linux-gnu " cgcc -target=x86_64 -target=host_os_specs -D__MMX__=1 -D__MMX_WITH_SSE__=1 -D__SSE2_MATH__=1 -D__SSE_MATH__=1 -D__SSE__=1 -D__SSE2__=1 -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -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 -mssse3 -I/workspace/dpdk-dir/include -I/workspace/ovn-tmp/dpdk-dir/include -include rte_config.h -mrtm -Werror -D_FILE_OFFSET_BITS=64 -MT lib/dhparams.lo -MD -MP -MF lib/.deps/dhparams.Tpo -c lib/dhparams.c -o lib/dhparams.o 890lib/netdev-dpdk.c: In function 'netdev_dpdk_vhost_client_reconfigure': 891lib/netdev-dpdk.c:6440:13: error: 'rte_vhost_driver_set_max_queue_num' is deprecated: Symbol is not yet part of stable ABI [-Werror=deprecated-declarations] 892 6440 | err = rte_vhost_driver_set_max_queue_num(dev->vhost_id, max_qp); 893 | ^~~ 894In file included from lib/netdev-dpdk.c:43: 895/workspace/dpdk-dir/include/rte_vhost.h:626:1: note: declared here 896 626 | rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs); 897 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > On 1/27/25 19:19, num...@ovn.org wrote: > > From: Numan Siddique <num...@ovn.org> > > > > fedora 37 is already end of life cycle. > > > > The fedora version number can be passed to the Dockerfile of > > ovn-kubernetes. > > > > Signed-off-by: Numan Siddique <num...@ovn.org> > > --- > > .ci/ovn-kubernetes/Dockerfile | 10 ++++++++-- > > .github/workflows/ovn-kubernetes.yml | 1 + > > 2 files changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile > > index 554b5551b5..caaa41708c 100644 > > --- a/.ci/ovn-kubernetes/Dockerfile > > +++ b/.ci/ovn-kubernetes/Dockerfile > > @@ -1,7 +1,8 @@ > > ARG OVNKUBE_COMMIT > > ARG GO_VERSION > > +ARG FEDORA_VERSION > > > > -FROM fedora:37 AS ovnbuilder > > +FROM fedora:$FEDORA_VERSION AS ovnbuilder > > > > USER root > > > > @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker* > > ARG GO_VERSION > > FROM golang:$GO_VERSION as ovnkubebuilder > > ARG OVNKUBE_COMMIT > > +ARG FEDORA_VERSION > > > > # Clone OVN Kubernetes and build the binary based on the commit passed as > > argument > > WORKDIR /root > > @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema > > pkg/sbdb/ovn-sb.ovsschema > > RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make > > > > # Build the final image > > -FROM fedora:37 > > +FROM fedora:$FEDORA_VERSION > > > > # install needed dependencies > > RUN INSTALL_PKGS=" \ > > @@ -76,6 +78,10 @@ RUN mkdir -p /var/run/openvswitch > > COPY --from=ovnbuilder /tmp/ovn/rpm/rpmbuild/RPMS/x86_64/*rpm ./ > > COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/x86_64/*rpm ./ > > COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/noarch/*rpm ./ > > + > > +# Delete network-scripts-openvswitch rpm generated earlier as it requires > > +# network-scripts package and it is no longer available from Fedora 41. > > +RUN rm -f network-scripts* > > RUN dnf install -y *.rpm && rm -f *.rpm > > > > # install ovn-kubernetes binaries built in previous stage > > diff --git a/.github/workflows/ovn-kubernetes.yml > > b/.github/workflows/ovn-kubernetes.yml > > index 50e48d11f8..83a305aa26 100644 > > --- a/.github/workflows/ovn-kubernetes.yml > > +++ b/.github/workflows/ovn-kubernetes.yml > > @@ -52,6 +52,7 @@ jobs: > > run: | > > docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }} > > \ > > --build-arg GO_VERSION=${{ env.GO_VERSION }} \ > > + --build-arg FEDORA_VERSION=41 \ > > --squash -t ovn-daemonset-f:dev -f > > .ci/ovn-kubernetes/Dockerfile . > > mkdir /tmp/_output > > docker save ovn-daemonset-f:dev > /tmp/_output/image.tar > _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
