From patchwork Thu Sep 10 18:56:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 1361874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnSmq0X7Cz9sTv for ; Fri, 11 Sep 2020 04:57:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BA7DC87746; Thu, 10 Sep 2020 18:57:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RNn8wL7FPGOC; Thu, 10 Sep 2020 18:57:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id CF2B887732; Thu, 10 Sep 2020 18:57:11 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B0317C0859; Thu, 10 Sep 2020 18:57:11 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 39935C0051 for ; Thu, 10 Sep 2020 18:57:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 207621FEDF for ; Thu, 10 Sep 2020 18:57:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hGTHKx7Q+ugf for ; Thu, 10 Sep 2020 18:57:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by silver.osuosl.org (Postfix) with ESMTPS id 6E855204F3 for ; Thu, 10 Sep 2020 18:57:08 +0000 (UTC) Received: from im-t490s.redhat.com (ip-78-45-89-65.net.upcbroadband.cz [78.45.89.65]) (Authenticated sender: i.maximets@ovn.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 94560100008; Thu, 10 Sep 2020 18:57:04 +0000 (UTC) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Thu, 10 Sep 2020 20:56:58 +0200 Message-Id: <20200910185658.2247844-1-i.maximets@ovn.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Cc: Han Zhou , Ilya Maximets Subject: [ovs-dev] [PATCH ovn] ovn-ic.at: Make AZ register test more reliable. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" 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 Acked-by: Han Zhou --- 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 ])