Message ID | 20200910185658.2247844-1-i.maximets@ovn.org |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev] ovn-ic.at: Make AZ register test more reliable. | expand |
On Thu, Sep 10, 2020 at 11:57 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > It might take some time for availability zone to become > visible in the output of 'show' command. > > This fixes periodic failures of testsuite jobs on Travis. > > Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> Thanks for the fix. Acked-by: Han Zhou <hzhou@ovn.org> > --- > tests/ovn-ic.at | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at > index 0d1ca6776..6fb00319a 100644 > --- a/tests/ovn-ic.at > +++ b/tests/ovn-ic.at > @@ -5,6 +5,7 @@ ovn_init_ic_db > ovn_start az1 > ovn_start az2 > > +OVS_WAIT_UNTIL([test `ovn-ic-sbctl show | wc -l` -eq 2]) > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > availability-zone az1 > availability-zone az2 > @@ -12,6 +13,7 @@ availability-zone az2 > > ovn_as az1 > ovn-nbctl set NB_Global . name=az3 > +OVS_WAIT_UNTIL([ovn-ic-sbctl show | grep -q az3]) > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > availability-zone az2 > availability-zone az3 > @@ -19,6 +21,7 @@ availability-zone az3 > > ovn_as az2 > ovn-nbctl set NB_Global . name=\"\" > +OVS_WAIT_WHILE([ovn-ic-sbctl show | grep -q az2]) > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > availability-zone az3 > ]) > -- > 2.25.4 >
On Fri, Sep 11, 2020 at 1:26 AM Han Zhou <hzhou@ovn.org> wrote: > > On Thu, Sep 10, 2020 at 11:57 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > > > It might take some time for availability zone to become > > visible in the output of 'show' command. > > > > This fixes periodic failures of testsuite jobs on Travis. > > > > Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ > registeration.") > > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > > > Thanks for the fix. > Acked-by: Han Zhou <hzhou@ovn.org> Thanks Ilya for the fix and Han for the review. I applied this patch to master. Numan > > > --- > > tests/ovn-ic.at | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at > > index 0d1ca6776..6fb00319a 100644 > > --- a/tests/ovn-ic.at > > +++ b/tests/ovn-ic.at > > @@ -5,6 +5,7 @@ ovn_init_ic_db > > ovn_start az1 > > ovn_start az2 > > > > +OVS_WAIT_UNTIL([test `ovn-ic-sbctl show | wc -l` -eq 2]) > > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > > availability-zone az1 > > availability-zone az2 > > @@ -12,6 +13,7 @@ availability-zone az2 > > > > ovn_as az1 > > ovn-nbctl set NB_Global . name=az3 > > +OVS_WAIT_UNTIL([ovn-ic-sbctl show | grep -q az3]) > > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > > availability-zone az2 > > availability-zone az3 > > @@ -19,6 +21,7 @@ availability-zone az3 > > > > ovn_as az2 > > ovn-nbctl set NB_Global . name=\"\" > > +OVS_WAIT_WHILE([ovn-ic-sbctl show | grep -q az2]) > > AT_CHECK([ovn-ic-sbctl show], [0], [dnl > > availability-zone az3 > > ]) > > -- > > 2.25.4 > > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index 0d1ca6776..6fb00319a 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -5,6 +5,7 @@ ovn_init_ic_db ovn_start az1 ovn_start az2 +OVS_WAIT_UNTIL([test `ovn-ic-sbctl show | wc -l` -eq 2]) AT_CHECK([ovn-ic-sbctl show], [0], [dnl availability-zone az1 availability-zone az2 @@ -12,6 +13,7 @@ availability-zone az2 ovn_as az1 ovn-nbctl set NB_Global . name=az3 +OVS_WAIT_UNTIL([ovn-ic-sbctl show | grep -q az3]) AT_CHECK([ovn-ic-sbctl show], [0], [dnl availability-zone az2 availability-zone az3 @@ -19,6 +21,7 @@ availability-zone az3 ovn_as az2 ovn-nbctl set NB_Global . name=\"\" +OVS_WAIT_WHILE([ovn-ic-sbctl show | grep -q az2]) AT_CHECK([ovn-ic-sbctl show], [0], [dnl availability-zone az3 ])
It might take some time for availability zone to become visible in the output of 'show' command. This fixes periodic failures of testsuite jobs on Travis. Fixes: 381c9319b1f0 ("ovn-ic: Interconnection controller with AZ registeration.") Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- tests/ovn-ic.at | 3 +++ 1 file changed, 3 insertions(+)