Skip to content

Commit

Permalink
ci: Don't run unit tests for system-test job.
Browse files Browse the repository at this point in the history
system-test matrix first runs unit tests and then system tests.
And if unit tests fail, system tests are not run.

This patch now runs only system tests for system-test matrix.
A new entry is added in the test matrix - 'gcc compiler with
unit tests'.

Signed-off-by: Numan Siddique <numans@ovn.org>
Acked-by: Dumitru Ceara <dceara@redhat.com>
  • Loading branch information
numansiddique committed Nov 8, 2021
1 parent a0ab19c commit 79915a0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
23 changes: 11 additions & 12 deletions .ci/linux-build.sh
Expand Up @@ -49,26 +49,25 @@ 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
make -j4 || { cat config.log; exit 1; }
if ! sudo make -j4 check-kernel RECHECK=yes; then
# system-kmod-testsuite.log is necessary for debugging.
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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Expand Up @@ -34,6 +34,8 @@ jobs:
- compiler: clang
opts: --disable-ssl

- compiler: gcc
testsuite: test
- compiler: gcc
testsuite: system-test
- compiler: clang
Expand Down

0 comments on commit 79915a0

Please sign in to comment.