diff mbox series

[ovs-dev,v2] OVN-CI: remove ddlog test cases.

Message ID 20220609122755.961288-1-mheib@redhat.com
State Accepted
Headers show
Series [ovs-dev,v2] OVN-CI: remove ddlog test cases. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Mohammad Heib June 9, 2022, 12:27 p.m. UTC 
currently there is no new changes applied to the ddlog code base
in ovn and we keep skipping ddlog test cases in our ci runs which leads
to so many skips lines printed to the ci logs and that cause us to miss
some tests cases that were skipped because of missing packages or any other reason.

This patch will remove ddlog test cases from the OVN-CI,
which will give us more clear ci output and less execution time.

Signed-off-by: Mohammad Heib <mheib@redhat.com>
---
 tests/atlocal.in    |  7 -------
 tests/ovn-macros.at | 12 ++----------
 tests/ovn-northd.at | 25 ++++++-------------------
 tests/ovn.at        |  6 ------
 tests/ovs-macros.at |  4 ----
 5 files changed, 8 insertions(+), 46 deletions(-)

Comments

Dumitru Ceara June 15, 2022, 9:33 a.m. UTC | #1 
On 6/9/22 14:27, Mohammad Heib wrote:
> currently there is no new changes applied to the ddlog code base
> in ovn and we keep skipping ddlog test cases in our ci runs which leads
> to so many skips lines printed to the ci logs and that cause us to miss
> some tests cases that were skipped because of missing packages or any other reason.
> 
> This patch will remove ddlog test cases from the OVN-CI,
> which will give us more clear ci output and less execution time.
> 
> Signed-off-by: Mohammad Heib <mheib@redhat.com>
> ---

Looks good to me, thanks!

Acked-by: Dumitru Ceara <dceara@redhat.com>
Numan Siddique June 17, 2022, 3:03 p.m. UTC | #2 
On Wed, Jun 15, 2022 at 5:33 AM Dumitru Ceara <dceara@redhat.com> wrote:
>
> On 6/9/22 14:27, Mohammad Heib wrote:
> > currently there is no new changes applied to the ddlog code base
> > in ovn and we keep skipping ddlog test cases in our ci runs which leads
> > to so many skips lines printed to the ci logs and that cause us to miss
> > some tests cases that were skipped because of missing packages or any other reason.
> >
> > This patch will remove ddlog test cases from the OVN-CI,
> > which will give us more clear ci output and less execution time.
> >
> > Signed-off-by: Mohammad Heib <mheib@redhat.com>
> > ---
>
> Looks good to me, thanks!
>
> Acked-by: Dumitru Ceara <dceara@redhat.com>

Thanks.  I applied this patch to the main.

Numan

>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox series

Patch

diff --git a/tests/atlocal.in b/tests/atlocal.in
index d2edea4ea..b3a011f41 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -218,10 +218,3 @@  export ASAN_OPTIONS
 # for the build.
 UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=true:log_path=ubsan:$UBSAN_OPTIONS
 export UBSAN_OPTIONS
-
-# Check whether we should run ddlog tests.
-if test '@DDLOGLIBDIR@' != no; then
-    TEST_DDLOG="yes"
-else
-    TEST_DDLOG="no"
-fi
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index c6f0f6251..335f9158c 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -748,22 +748,14 @@  m4_define([OVN_POPULATE_ARP], [AT_CHECK(ovn_populate_arp__, [0], [ignore])])
 # Defines a versions of a test with all combinations of northd and
 # datapath groups.
 m4_define([OVN_FOR_EACH_NORTHD],
-  [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog],
+  [m4_foreach([NORTHD_TYPE], [ovn-northd],
      [m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no],
        [m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
 ])])])])
 
 # Some tests aren't prepared for dp groups to be enabled.
 m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS],
-  [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog],
-     [m4_foreach([NORTHD_USE_DP_GROUPS], [no],
-       [m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
-])])])])
-
-# Some tests aren't prepared for ddlog to be enabled.
-m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DDLOG],
   [m4_foreach([NORTHD_TYPE], [ovn-northd],
-     [m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no],
+     [m4_foreach([NORTHD_USE_DP_GROUPS], [no],
        [m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
 ])])])])
-
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index a94a7d441..e7b535cab 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -780,10 +780,6 @@  check_row_count Datapath_Binding 1
 check_row_count Logical_Flow $lf
 
 # Now re-enable the nbdb connection and observe ovn-northd catch up.
-#
-# It's important to check both Datapath_Binding and Logical_Flow because
-# ovn-northd-ddlog implements them in different ways that might go wrong
-# differently on reconnection.
 check as ovn-nb ovs-appctl -t ovsdb-server ovsdb-server/add-remote "$conn"
 wait_row_count Datapath_Binding 2
 wait_row_count Logical_Flow $(expr 2 \* $lf)
@@ -817,9 +813,7 @@  OVN_SB_DB=${conn2#p} check_row_count Logical_Flow $lf
 
 # Now re-enable the sbdb connection and observe ovn-northd catch up.
 #
-# It's important to check both Datapath_Binding and Logical_Flow because
-# ovn-northd-ddlog implements them in different ways that might go wrong
-# differently on reconnection.
+# It's important to check both Datapath_Binding and Logical_Flow.
 check as ovn-sb ovs-appctl -t ovsdb-server ovsdb-server/add-remote "$conn"
 wait_row_count Datapath_Binding 2
 wait_row_count Logical_Flow $(expr 2 \* $lf)
@@ -2161,10 +2155,8 @@  template_band=$(fetch_column nb:meter bands name=meter_me)
 check ovn-nbctl --wait=sb set meter_band $template_band rate=123
 AS_BOX([Make sure that every Meter_Band has the right rate.])
 # ovn-northd creates 4 identical Meter_Band rows, all identical;
-# ovn-northd-ddlog creates just 1.  It doesn't matter, they work just
-# as well.)
 n_meter_bands=$(count_rows meter_band)
-AT_FAIL_IF([test "$n_meter_bands" != 1 && test "$n_meter_bands" != 4])
+AT_FAIL_IF([test "$n_meter_bands" != 4])
 check_row_count meter_band $n_meter_bands rate=123
 
 AS_BOX([Check meter in logical flows for acl logs])
@@ -4419,13 +4411,7 @@  AT_CHECK([grep -w "ls_in_dhcp_options" sw0flows | sort | sed 's/table=../table=?
 AT_CLEANUP
 ])
 
-# XXX This test currently only runs for northd.c. The test fails
-# with ovn-northd-ddlog because of the section where 2 HA_Chassis_Groups
-# are used by 2 routers. For some reason, this causes ovn-northd-ddlog
-# to stop processing new changes to the northbound database and to
-# seemingly infinitely loop. This issue has been reported, but there is
-# currently no fix for it. Once this issue is fixed, we can run this
-# test for both C and DDLog versions of northd.
+OVN_FOR_EACH_NORTHD([
 AT_SETUP([ovn -- NAT and Load Balancer flows])
 
 # Determine if expected flows are present. The only parameter to this
@@ -4664,6 +4650,7 @@  check ovn-nbctl --wait=sb clear logical_router_port ro2-sw ha_chassis_group
 check_lflows 0
 
 AT_CLEANUP
+])
 
 OVN_FOR_EACH_NORTHD([
 AT_SETUP([ovn -- ARP flows for unreachable addresses - NAT and LB])
@@ -7201,7 +7188,7 @@  ct_next(ct_state=new|trk);
 AT_CLEANUP
 ])
 
-OVN_FOR_EACH_NORTHD_WITHOUT_DDLOG([
+OVN_FOR_EACH_NORTHD([
 AT_SETUP([northd-parallelization unixctl])
 ovn_start
 
@@ -7245,7 +7232,7 @@  ovn-appctl: ovn-northd: server returned an error
 AT_CLEANUP
 ])
 
-OVN_FOR_EACH_NORTHD_WITHOUT_DDLOG([
+OVN_FOR_EACH_NORTHD([
 AT_SETUP([northd-parallelization runtime])
 ovn_start
 
diff --git a/tests/ovn.at b/tests/ovn.at
index 59d51f3e0..0738a6511 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -8031,11 +8031,8 @@  ovn-nbctl acl-add lsw0 to-lport 1002 'outport == "lp1" && ip6 && icmp6'  allow-r
 ovn-nbctl acl-add lsw0 to-lport 1002 'outport == "lp2" && ip6 && icmp6'  allow-related
 
 # Allow some time for ovn-northd and ovn-controller to catch up.
-# XXX The "sleep" here seems to be essential for ovn-northd-ddlog,
-# which may indicate that it needs improvement.
 wait_for_ports_up
 check ovn-nbctl --wait=hv sync
-sleep 1
 
 ovn-nbctl dump-flows > sbflows
 AT_CAPTURE_FILE([sbflows])
@@ -23917,9 +23914,6 @@  AT_CLEANUP
 OVN_FOR_EACH_NORTHD([
 AT_SETUP([interconnection])
 
-dnl This test has problems with ovn-northd-ddlog.
-AT_SKIP_IF([test NORTHD_TYPE = ovn-northd-ddlog && test "$RUN_ANYWAY" != yes])
-
 ovn_init_ic_db
 n_az=5
 n_ts=5
diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at
index 09c05cf16..94dffa994 100644
--- a/tests/ovs-macros.at
+++ b/tests/ovs-macros.at
@@ -7,7 +7,6 @@  dnl Make AT_SETUP automatically do some things for us:
 dnl - Run the ovs_init() shell function as the first step in every test.
 dnl - If NORTHD_TYPE is defined, then append it to the test name and
 dnl   set it as a shell variable as well.
-dnl - Skip the test if it's for ovn-northd-ddlog but it didn't get built.
 m4_rename([AT_SETUP], [OVS_AT_SETUP])
 m4_define([AT_SETUP],
   [OVS_AT_SETUP($@[]m4_ifdef([NORTHD_TYPE], [ -- NORTHD_TYPE])[]m4_ifdef([NORTHD_USE_DP_GROUPS], [ -- dp-groups=NORTHD_USE_DP_GROUPS])[]m4_ifdef([NORTHD_USE_PARALLELIZATION], [ -- parallelization=NORTHD_USE_PARALLELIZATION]))
@@ -19,9 +18,6 @@  m4_ifdef([NORTHD_USE_PARALLELIZATION], [[NORTHD_USE_PARALLELIZATION]=NORTHD_USE_
 ])dnl
 m4_ifdef([NORTHD_DUMMY_NUMA], [[NORTHD_DUMMY_NUMA]=NORTHD_DUMMY_NUMA
 ])dnl
-m4_if(NORTHD_TYPE, [ovn-northd-ddlog], [dnl
-AT_SKIP_IF([test $TEST_DDLOG = no])
-])dnl
 ovs_init
 ])