Skip to content

Commit

Permalink
ci: ovn-kubernetes: Use official build instructions when preparing rpms.
Browse files Browse the repository at this point in the history
Recently OVS enabled AF_XDP support by default and that broke our RPM
build because of missing dependencies.

Fixes: 2ca0a4b ("utilities: Do not send 'set-db-change-aware' for non-daemon mode tools.")
Suggested-by: Ilya Maximets <i.maximets@ovn.org>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
  • Loading branch information
dceara committed Jan 19, 2023
1 parent cd600de commit eee79e5
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .ci/ovn-kubernetes/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,25 @@ USER root
ENV PYTHONDONTWRITEBYTECODE yes

# install needed rpms - openvswitch must be 2.10.4 or higher
RUN INSTALL_PKGS=" \
python3-pyyaml bind-utils procps-ng openssl numactl-libs firewalld-filesystem \
libpcap hostname desktop-file-utils \
python3-openvswitch python3-pyOpenSSL \
autoconf automake libtool g++ gcc fedora-packager rpmdevtools \
unbound unbound-devel groff python3-sphinx graphviz openssl openssl-devel \
checkpolicy libcap-ng-devel selinux-policy-devel" && \
dnf install --best --refresh -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
dnf clean all && rm -rf /var/cache/dnf/*
RUN INSTALL_PKGS=" rpm-build dnf-plugins-core" && \
dnf install --best --refresh -y --setopt=tsflags=nodocs $INSTALL_PKGS

# Build OVS and OVN rpms from current folder
RUN mkdir /tmp/ovn
COPY . /tmp/ovn
WORKDIR /tmp/ovn/ovs

RUN sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-fedora.spec.in > /tmp/ovs.spec
RUN dnf builddep -y /tmp/ovs.spec
RUN ./boot.sh
RUN ./configure -v
RUN make rpm-fedora
RUN rm rpm/rpmbuild/RPMS/x86_64/*debug*
RUN rm rpm/rpmbuild/RPMS/x86_64/*devel*

WORKDIR /tmp/ovn
RUN sed -e 's/@VERSION@/0.0.1/' rhel/ovn-fedora.spec.in > /tmp/ovn.spec
RUN dnf builddep -y /tmp/ovn.spec
RUN ./boot.sh
RUN ./configure
RUN make rpm-fedora
Expand Down

0 comments on commit eee79e5

Please sign in to comment.