[ovs-dev] travis: Fix building datapath instead of userspace with DPDK_SHARED.

Message ID 20190207152936.24309-1-i.maximets@samsung.com
State Superseded
Delegated to: Ian Stokes
Headers show
Series
  • [ovs-dev] travis: Fix building datapath instead of userspace with DPDK_SHARED.
Related show

Commit Message

Ilya Maximets Feb. 7, 2019, 3:29 p.m.
Current script does not check build of OVS with DPDK.
It builds datapath instead:
  https://travis-ci.org/openvswitch/ovs/jobs/489520695

CC: Ian Stokes <ian.stokes@intel.com>
Fixes: edfe8d263d2e ("travis: Add dpdk shared library build.")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
---
 .travis/linux-build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Aaron Conole Feb. 7, 2019, 4:36 p.m. | #1
Ilya Maximets <i.maximets@samsung.com> writes:

> Current script does not check build of OVS with DPDK.
> It builds datapath instead:
>   https://travis-ci.org/openvswitch/ovs/jobs/489520695
>
> CC: Ian Stokes <ian.stokes@intel.com>
> Fixes: edfe8d263d2e ("travis: Add dpdk shared library build.")
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---

Neat catch!

Acked-by: Aaron Conole <aconole@redhat.com>
Ilya Maximets Feb. 8, 2019, 4:54 p.m. | #2
I re-sent this patch as part of the series:

    https://patchwork.ozlabs.org/project/openvswitch/list/?series=90839

Best regards, Ilya Maximets.

On 07.02.2019 19:36, Aaron Conole wrote:
> Ilya Maximets <i.maximets@samsung.com> writes:
> 
>> Current script does not check build of OVS with DPDK.
>> It builds datapath instead:
>>   https://travis-ci.org/openvswitch/ovs/jobs/489520695
>>
>> CC: Ian Stokes <ian.stokes@intel.com>
>> Fixes: edfe8d263d2e ("travis: Add dpdk shared library build.")
>> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
>> ---
> 
> Neat catch!
> 
> Acked-by: Aaron Conole <aconole@redhat.com>
> 
>

Patch

diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 9d177aa1b..8c931ebc5 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -43,7 +43,7 @@  function install_kernel()
     fi
 
     KERNELSRC=$(pwd)
-    if [ ! "$DPDK" ]; then
+    if [ ! "$DPDK" ] && [ ! "$DPDK_SHARED" ]; then
         EXTRA_OPTS="--with-linux=$(pwd)"
     fi
     echo "Installed kernel source in $(pwd)"
@@ -106,7 +106,8 @@  configure_ovs $EXTRA_OPTS $*
 make selinux-policy
 
 # Only build datapath if we are testing kernel w/o running testsuite
-if [ "$KERNEL" ] && [ ! "$TESTSUITE" ] && [ ! "$DPDK" ]; then
+if [ "$KERNEL" ] && [ ! "$TESTSUITE" ] && \
+   [ ! "$DPDK" ] && [ ! "$DPDK_SHARED" ]; then
     cd datapath
 fi