From d2f1f341430939d6962ad0e4decdbe8bb70c19a9 Mon Sep 17 00:00:00 2001 From: Xu Liu Date: Thu, 14 Mar 2024 09:28:58 +0800 Subject: [PATCH] Do not run tests when building OVS for UBI (#6104) This change adds back the default `RPMBUILD_OPT` to disable unnecessary tests when building OVS rpm packages, which was previously overwritten in #6052. Signed-off-by: Xu Liu --- build/images/ovs/Dockerfile.ubi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/images/ovs/Dockerfile.ubi b/build/images/ovs/Dockerfile.ubi index a4959a8d7fe..7a39dff5782 100644 --- a/build/images/ovs/Dockerfile.ubi +++ b/build/images/ovs/Dockerfile.ubi @@ -33,9 +33,9 @@ RUN cd /tmp/openvswitch* && \ yum-builddep -y /tmp/ovs.spec && ./boot.sh && \ ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc && \ # 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. + # 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*