@@ -40,22 +40,27 @@ jobs:
- { compiler: gcc, testsuite: test, testsuite_kw: "parallelization=yes,ovn_monitor_all=no" }
- { compiler: gcc, testsuite: test, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
- { compiler: gcc, testsuite: test, testsuite_kw: "parallelization=no,ovn_monitor_all=no" }
+ - { compiler: gcc, testsuite: test, testsuite_kw: "!ovn_for_each_northd" }
- { compiler: clang, testsuite: test, sanitizers: sanitizers, testsuite_kw: "parallelization=yes,ovn_monitor_all=yes" }
- { compiler: clang, testsuite: test, sanitizers: sanitizers, testsuite_kw: "parallelization=yes,ovn_monitor_all=no" }
- { compiler: clang, testsuite: test, sanitizers: sanitizers, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
- { compiler: clang, testsuite: test, sanitizers: sanitizers, testsuite_kw: "parallelization=no,ovn_monitor_all=no" }
+ - { compiler: clang, testsuite: test, sanitizers: sanitizers, testsuite_kw: "!ovn_for_each_northd" }
- { compiler: gcc, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=yes,ovn_monitor_all=yes" }
- { compiler: gcc, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=yes,ovn_monitor_all=no" }
- { compiler: gcc, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
- { compiler: gcc, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=no,ovn_monitor_all=no" }
+ - { compiler: gcc, testsuite: test, libs: -ljemalloc, testsuite_kw: "!ovn_for_each_northd" }
- { compiler: clang, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=yes,ovn_monitor_all=yes" }
- { compiler: clang, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=yes,ovn_monitor_all=no" }
- { compiler: clang, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
- { compiler: clang, testsuite: test, libs: -ljemalloc, testsuite_kw: "parallelization=no,ovn_monitor_all=no" }
+ - { compiler: clang, testsuite: test, libs: -ljemalloc, testsuite_kw: "!ovn_for_each_northd" }
- { compiler: gcc, testsuite: system-test, testsuite_kw: "parallelization=yes,ovn_monitor_all=yes" }
- { compiler: gcc, testsuite: system-test, testsuite_kw: "parallelization=yes,ovn_monitor_all=no" }
- { compiler: gcc, testsuite: system-test, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
- - { compiler: gcc, testsuite: system-test, testsuite_kw: "parallelization=no,ovn_monitor_all=no" }
+ - { compiler: gcc, testsuite: system-test, testsuite_kw: "parallelization=no,ovn_monitor_all=yes" }
+ - { compiler: gcc, testsuite: system-test, testsuite_kw: "!ovn_for_each_northd" }
- { compiler: gcc, m32: m32, opts: --disable-ssl}
steps:
@@ -10,7 +10,9 @@ dnl set it as a shell variable as well.
m4_rename([AT_SETUP], [OVS_AT_SETUP])
m4_define([AT_SETUP],
[OVS_AT_SETUP($@[]m4_ifdef([NORTHD_TYPE], [ -- NORTHD_TYPE])[]m4_ifdef([NORTHD_USE_PARALLELIZATION], [ -- parallelization=NORTHD_USE_PARALLELIZATION])[]m4_ifdef([OVN_MONITOR_ALL], [ -- ovn_monitor_all=OVN_MONITOR_ALL]))
-m4_ifdef([NORTHD_TYPE], [[NORTHD_TYPE]=NORTHD_TYPE
+m4_ifdef([NORTHD_TYPE], [dnl
+[NORTHD_TYPE]=NORTHD_TYPE
+AT_KEYWORDS([ovn_for_each_northd])
])dnl
m4_ifdef([NORTHD_USE_PARALLELIZATION], [[NORTHD_USE_PARALLELIZATION]=NORTHD_USE_PARALLELIZATION
])dnl
After switch to parallel jobs some tests were missing due to way how filtering in autotest works. Add new keyword for the OVN_FOR_EACH_NORTHD tests and add jobs that will run them. Fixes: d093905 ("OVN-CI: ovn unit tests run in parallel jobs.") Signed-off-by: Ales Musil <amusil@redhat.com> --- .github/workflows/test.yml | 7 ++++++- tests/ovs-macros.at | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-)