[ovs-dev] [PATCH 6/6] ci: add the opts about ALLOW_EXPERIMENTAL_API

[Simon Horman]

From: Peng Zhang <peng.zh...@corigine.com>

This commit adds support for OVS-DPDK with -DALLOW_EXPERIMENTAL_API.

Tunnel offloads and Meter offloads are experimental APIs in DPDK. To
enable these features, compile need add -DALLOW_EXPERIMENTAL_API. So
in workflow, we also need need the new test with
-DALLOW_EXPERIMENTAL_API.

Signed-off-by: Peng Zhang <peng.zh...@corigine.com>
---
 .ci/linux-build.sh                   |  4 ++++
 .github/workflows/build-and-test.yml | 31 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 485109672388..1dc6414a162d 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -227,6 +227,10 @@ assert ovs.json.from_string('{\"a\": 42}') == {'a': 42}"
     exit 0
 fi
 
+if [ "$CFG_OPTS" ]; then
+    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} ${CFG_OPTS}"
+fi
+
 if [ "$KERNEL" ]; then
     install_kernel $KERNEL
 fi
diff --git a/.github/workflows/build-and-test.yml 
b/.github/workflows/build-and-test.yml
index e08d7b1bac1e..d42b61acfb7e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,6 +20,7 @@ jobs:
       M32:         ${{ matrix.m32 }}
       OPTS:        ${{ matrix.opts }}
       TESTSUITE:   ${{ matrix.testsuite }}
+      CFG_OPTS:    ${{ matrix.cfg_opts }}
 
     name: linux ${{ join(matrix.*, ' ') }}
     runs-on: ubuntu-20.04
@@ -53,9 +54,17 @@ jobs:
           - compiler:     gcc
             testsuite:    test
             dpdk:         dpdk
+          - compiler:     gcc
+            testsuite:    test
+            dpdk:         dpdk
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
+          - compiler:     clang
+            testsuite:    test
+            dpdk:         dpdk
           - compiler:     clang
             testsuite:    test
             dpdk:         dpdk
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
 
           - compiler:     gcc
             testsuite:    test
@@ -74,21 +83,43 @@ jobs:
           - compiler:     gcc
             dpdk:         dpdk
             opts:         --enable-shared
+          - compiler:     gcc
+            dpdk:         dpdk
+            opts:         --enable-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
+          - compiler:     clang
+            dpdk:         dpdk
+            opts:         --enable-shared
           - compiler:     clang
             dpdk:         dpdk
             opts:         --enable-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
 
           - compiler:     gcc
             dpdk_shared:  dpdk-shared
+          - compiler:     gcc
+            dpdk_shared:  dpdk-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
           - compiler:     clang
             dpdk_shared:  dpdk-shared
+          - compiler:     clang
+            dpdk_shared:  dpdk-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
 
           - compiler:     gcc
             dpdk_shared:  dpdk-shared
             opts:         --enable-shared
+          - compiler:     gcc
+            dpdk_shared:  dpdk-shared
+            opts:         --enable-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
+          - compiler:     clang
+            dpdk_shared:  dpdk-shared
+            opts:         --enable-shared
           - compiler:     clang
             dpdk_shared:  dpdk-shared
             opts:         --enable-shared
+            cfg_opts:     -DALLOW_EXPERIMENTAL_API
 
           - compiler:     gcc
             m32:          m32
-- 
2.30.2

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev