[lxc-devel] [lxc-ci/master] bin/test-lxd-ovn: Reorders comms tests so that external is last

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 469 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201012/e8e60c51/attachment.bin>
-------------- next part --------------
From 1b643e93288ed271f59146ea43ab7aa2221fa7c1 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Mon, 12 Oct 2020 16:26:41 +0100
Subject: [PATCH] bin/test-lxd-ovn: Reorders comms tests so that external is
 last

Adds OVN to lxdbr0 test before external test, so we can see where intermittent failures are occurring.

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 bin/test-lxd-ovn | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/bin/test-lxd-ovn b/bin/test-lxd-ovn
index e8261ea..318dc06 100755
--- a/bin/test-lxd-ovn
+++ b/bin/test-lxd-ovn
@@ -96,10 +96,6 @@ echo "==> lxdbr0 to OVN gateway"
 lxc exec u1 -- ping -c1 -4 10.10.10.200
 lxc exec u1 -- ping -c1 -6 fd42:4242:4242:1010::200
 
-echo "==> OVN to internet"
-lxc exec u2 -- ping -c1 -4 linuxcontainers.org
-lxc exec u2 -- ping -c1 -6 linuxcontainers.org
-
 echo "==> OVN to OVN"
 lxc exec u2 -- ping -c1 -4 "${U3_IPV4}"
 lxc exec u2 -- ping -c1 -6 "${U3_IPV6}"
@@ -112,6 +108,14 @@ echo "==> DNS resolution on OVN"
 lxc exec u3 -- ping -c1 -4 u2.lxd
 lxc exec u3 -- ping -c1 -6 u2.lxd
 
+echo "==> OVN to lxdbr0"
+lxc exec u2 -- ping -c1 10.10.10.1
+lxc exec u2 -- ping -c1 fd42:4242:4242:1010::1
+
+echo "==> OVN to internet"
+lxc exec u2 -- ping -c1 -4 linuxcontainers.org
+lxc exec u2 -- ping -c1 -6 linuxcontainers.org
+
 echo "===> Testing project restrictions"
 lxc project create testovn -c features.networks=true -c restricted=true
 
@@ -168,10 +172,6 @@ echo "==> lxdbr0 to OVN gateway in project testovn"
 lxc exec u1 --project default -- ping -c1 -4 10.10.10.201
 lxc exec u1 --project default -- ping -c1 -6 fd42:4242:4242:1010::201
 
-echo "==> OVN to internet in project testovn"
-lxc exec u2 -- ping -c1 -4 linuxcontainers.org
-lxc exec u2 -- ping -c1 -6 linuxcontainers.org
-
 echo "==> OVN to OVN in project testovn"
 lxc exec u2 -- ping -c1 -4 "${U3_IPV4}"
 lxc exec u2 -- ping -c1 -6 "${U3_IPV6}"
@@ -184,6 +184,14 @@ echo "==> DNS resolution on OVN in project testovn"
 lxc exec u3 -- ping -c1 -4 u2.lxd
 lxc exec u3 -- ping -c1 -6 u2.lxd
 
+echo "==> OVN to lxdbr0 in project testovn"
+lxc exec u2 -- ping -c1 10.10.10.1
+lxc exec u2 -- ping -c1 fd42:4242:4242:1010::1
+
+echo "==> OVN to internet in project testovn"
+lxc exec u2 -- ping -c1 -4 linuxcontainers.org
+lxc exec u2 -- ping -c1 -6 linuxcontainers.org
+
 echo "===> Check network in use protection from deletion"
 # Delete instances in default project first.
 lxc delete -f u1 u2 u3 --project default