Skip to content

Commit

Permalink
Do not run tests when building OVS for UBI
Browse files Browse the repository at this point in the history
This change adds back the default `RPMBUILD_OPT` to disable
unnecessary tests when building OVS rpm packages, which was
previously overwritten in antrea-io#6052.

Signed-off-by: Xu Liu <[email protected]>
  • Loading branch information
xliuxu committed Mar 13, 2024
1 parent 7e3aa12 commit d5643aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/images/ovs/Dockerfile.ubi
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN cd /tmp/openvswitch* && \
# logrotate needs to run as the same user as OVS to get the proper permissions of log files.
# As Antrea runs OVS as root, we disable libcapng to make logrotate also run as root.
# See https://github.com/openvswitch/ovs/blob/v2.17.7/rhel/openvswitch-fedora.spec.in#L26-L27.
RPMBUILD_OPT="--without libcapng" make rpm-fedora && mkdir -p /tmp/ovs-rpms && \
RPMBUILD_OPT="--without libcapng --without check" make rpm-fedora && mkdir -p /tmp/ovs-rpms && \
mv /tmp/openvswitch-$OVS_VERSION/rpm/rpmbuild/RPMS/*/*.rpm /tmp/ovs-rpms && \
rm -rf /tmp/openvswitch*

Expand Down

0 comments on commit d5643aa

Please sign in to comment.