| Message ID | 20230718095331.2443200-2-xsimonar@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Unexpected warning "Trying to release unknown | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On Tue, Jul 18, 2023 at 11:54 AM Xavier Simonart <xsimonar@redhat.com> wrote: > Before this patch, each system test was supposed to run four times: > - with and without northd-parallelization > - with and without monitor-all > However, while the titles of the test were updated, system tests were never > run with monitor-all=true (i.e. they were run twice w/o monitor-all). > > This is now fixed, and the four flavors of the tssts are run. > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > --- > tests/system-dpdk-macros.at | 4 ++++ > tests/system-kmod-macros.at | 3 +++ > tests/system-userspace-macros.at | 3 +++ > 3 files changed, 10 insertions(+) > > diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at > index 8843baa25..440908af7 100644 > --- a/tests/system-dpdk-macros.at > +++ b/tests/system-dpdk-macros.at > @@ -47,6 +47,10 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], > dnl Add bridges, ports, etc. > OVS_WAIT_WHILE([ip link show br0]) > AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| > uuidfilt])], [0], [$2]) > + > + if test OVN_MONITOR_ALL = yes; then > + ovs-vsctl set open . external_ids:ovn-monitor-all=true > + fi > ]) > > # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > index 787a59c97..6f6670199 100644 > --- a/tests/system-kmod-macros.at > +++ b/tests/system-kmod-macros.at > @@ -27,6 +27,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], > _OVS_VSWITCHD_START([]) > dnl Add bridges, ports, etc. > AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| > uuidfilt])], [0], [$2]) > + if test OVN_MONITOR_ALL = yes; then > + ovs-vsctl set open . external_ids:ovn-monitor-all=true > + fi > ]) > > # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) > diff --git a/tests/system-userspace-macros.at b/tests/ > system-userspace-macros.at > index 86ed22622..73ca2cce3 100644 > --- a/tests/system-userspace-macros.at > +++ b/tests/system-userspace-macros.at > @@ -19,6 +19,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], > dnl Add bridges, ports, etc. > OVS_WAIT_WHILE([ip link show br0]) > AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| > uuidfilt])], [0], [$2]) > + if test OVN_MONITOR_ALL = yes; then > + ovs-vsctl set open . external_ids:ovn-monitor-all=true > + fi > ]) > > # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) > -- > 2.31.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > Nice catch! Acked-by: Ales Musil <amusil@redhat.com>
On 7/19/23 08:23, Ales Musil wrote: > On Tue, Jul 18, 2023 at 11:54 AM Xavier Simonart <xsimonar@redhat.com> > wrote: > >> Before this patch, each system test was supposed to run four times: >> - with and without northd-parallelization >> - with and without monitor-all >> However, while the titles of the test were updated, system tests were never >> run with monitor-all=true (i.e. they were run twice w/o monitor-all). >> >> This is now fixed, and the four flavors of the tssts are run. >> >> Signed-off-by: Xavier Simonart <xsimonar@redhat.com> >> --- >> tests/system-dpdk-macros.at | 4 ++++ >> tests/system-kmod-macros.at | 3 +++ >> tests/system-userspace-macros.at | 3 +++ >> 3 files changed, 10 insertions(+) >> >> diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at >> index 8843baa25..440908af7 100644 >> --- a/tests/system-dpdk-macros.at >> +++ b/tests/system-dpdk-macros.at >> @@ -47,6 +47,10 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], >> dnl Add bridges, ports, etc. >> OVS_WAIT_WHILE([ip link show br0]) >> AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| >> uuidfilt])], [0], [$2]) >> + >> + if test OVN_MONITOR_ALL = yes; then >> + ovs-vsctl set open . external_ids:ovn-monitor-all=true >> + fi >> ]) >> >> # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) >> diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at >> index 787a59c97..6f6670199 100644 >> --- a/tests/system-kmod-macros.at >> +++ b/tests/system-kmod-macros.at >> @@ -27,6 +27,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], >> _OVS_VSWITCHD_START([]) >> dnl Add bridges, ports, etc. >> AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| >> uuidfilt])], [0], [$2]) >> + if test OVN_MONITOR_ALL = yes; then >> + ovs-vsctl set open . external_ids:ovn-monitor-all=true >> + fi >> ]) >> >> # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) >> diff --git a/tests/system-userspace-macros.at b/tests/ >> system-userspace-macros.at >> index 86ed22622..73ca2cce3 100644 >> --- a/tests/system-userspace-macros.at >> +++ b/tests/system-userspace-macros.at >> @@ -19,6 +19,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], >> dnl Add bridges, ports, etc. >> OVS_WAIT_WHILE([ip link show br0]) >> AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| >> uuidfilt])], [0], [$2]) >> + if test OVN_MONITOR_ALL = yes; then >> + ovs-vsctl set open . external_ids:ovn-monitor-all=true >> + fi >> ]) >> >> # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) >> -- >> 2.31.1 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >> > Nice catch! > Indeed! > Acked-by: Ales Musil <amusil@redhat.com> > Thanks, applied to main and backported to all branches down to 22.03. Regards, Dumitru
diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at index 8843baa25..440908af7 100644 --- a/tests/system-dpdk-macros.at +++ b/tests/system-dpdk-macros.at @@ -47,6 +47,10 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], dnl Add bridges, ports, etc. OVS_WAIT_WHILE([ip link show br0]) AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2]) + + if test OVN_MONITOR_ALL = yes; then + ovs-vsctl set open . external_ids:ovn-monitor-all=true + fi ]) # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 787a59c97..6f6670199 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -27,6 +27,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], _OVS_VSWITCHD_START([]) dnl Add bridges, ports, etc. AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2]) + if test OVN_MONITOR_ALL = yes; then + ovs-vsctl set open . external_ids:ovn-monitor-all=true + fi ]) # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds]) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 86ed22622..73ca2cce3 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -19,6 +19,9 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], dnl Add bridges, ports, etc. OVS_WAIT_WHILE([ip link show br0]) AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2]) + if test OVN_MONITOR_ALL = yes; then + ovs-vsctl set open . external_ids:ovn-monitor-all=true + fi ]) # OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])
Before this patch, each system test was supposed to run four times: - with and without northd-parallelization - with and without monitor-all However, while the titles of the test were updated, system tests were never run with monitor-all=true (i.e. they were run twice w/o monitor-all). This is now fixed, and the four flavors of the tssts are run. Signed-off-by: Xavier Simonart <xsimonar@redhat.com> --- tests/system-dpdk-macros.at | 4 ++++ tests/system-kmod-macros.at | 3 +++ tests/system-userspace-macros.at | 3 +++ 3 files changed, 10 insertions(+)