[ovs-dev] [PATCH ovn] ci: Don't run unit tests for system-test job.

numans at ovn.org numans at ovn.org
Wed Nov 3 16:01:28 UTC 2021


From: Numan Siddique <numans at ovn.org>

For the system-test matrix, running unit tests is not
required and if a unit test fails, then system tests
are not run.  Also test matrix covers unit tests anyway.

Signed-off-by: Numan Siddique <numans at ovn.org>
---
 .ci/linux-build.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 76a2ff459f..b0975685d4 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -49,17 +49,6 @@ else
 fi
 
 if [ "$TESTSUITE" ]; then
-    # 'distcheck' will reconfigure with required options.
-    # Now we only need to prepare the Makefile without sparse-wrapped CC.
-    configure_ovn
-
-    export DISTCHECK_CONFIGURE_FLAGS="$OPTS"
-    if ! make distcheck -j4 TESTSUITEFLAGS="-j4" RECHECK=yes; then
-        # testsuite.log is necessary for debugging.
-        cat */_build/sub/tests/testsuite.log
-        exit 1
-    fi
-
     if [ "$TESTSUITE" = "system-test" ]; then
         # Reconfigure build with required OPTS, rebuild and run system tests.
         configure_ovn $OPTS
@@ -69,6 +58,17 @@ if [ "$TESTSUITE" ]; then
             cat tests/system-kmod-testsuite.log
             exit 1
         fi
+    else
+        # 'distcheck' will reconfigure with required options.
+        # Now we only need to prepare the Makefile without sparse-wrapped CC.
+        configure_ovn
+
+        export DISTCHECK_CONFIGURE_FLAGS="$OPTS"
+        if ! make distcheck -j4 TESTSUITEFLAGS="-j4" RECHECK=yes; then
+            # testsuite.log is necessary for debugging.
+            cat */_build/sub/tests/testsuite.log
+            exit 1
+        fi
     fi
 else
     configure_ovn $OPTS
-- 
2.31.1



More information about the dev mailing list