We would lose all logs and databases once the boundary between
tests is crossed, that's by design so other tests don't start with
unwanted data. However, in case of test failure we want to preserve
the data to help with the analysis of the failure. Make sure we
collect databases and logs after each test.

Signed-off-by: Ales Musil <[email protected]>
---
 tests/multinode-macros.at | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at
index db296e98e..487696a62 100644
--- a/tests/multinode-macros.at
+++ b/tests/multinode-macros.at
@@ -124,10 +124,6 @@ check_fake_multinode_setup_by_nodes() {
     check m_as ovn-central-az1 ovn-nbctl --wait=sb sync
     for c; do
         AT_CHECK([m_as $c ovn-appctl -t ovn-controller version], [0], [ignore])
-        on_exit "m_as $c ovs-vsctl list Interface > interfaces-${c}.txt"
-        on_exit "m_as $c ovs-vsctl show > ovs-${chassis}.txt"
-        on_exit "m_as $c ovs-ofctl dump-flows br-int > flow-${c}.txt"
-        on_exit "m_as $c ovs-vsctl get open . external_ids > extids-${c}.txt"
     done
 
     # Check $ENABLE_SSL variable, and use SSL if unset (default) or not set to 
"no".
@@ -160,6 +156,20 @@ check_fake_multinode_setup() {
     check_fake_multinode_setup_by_nodes                         \
         ovn-chassis-1 ovn-chassis-2 ovn-chassis-3 ovn-chassis-4 \
         ovn-gw-1 ovn-gw-2 ovn-gw-3 ovn-gw-4
+
+    for c in ovn-chassis-1 ovn-chassis-2 ovn-chassis-3 ovn-chassis-4 \
+             ovn-gw-1 ovn-gw-2 ovn-gw-3 ovn-gw-4 \
+             ovn-central-az1; do
+        mkdir $c
+        on_exit "m_as $c ovs-vsctl list Interface > ${c}/interfaces.txt || 
true"
+        on_exit "m_as $c ovs-vsctl show > ${c}/ovs.txt || true"
+        on_exit "m_as $c ovs-ofctl dump-flows br-int > ${c}/flow.txt || true"
+        on_exit "m_as $c ovs-vsctl get open . external_ids > ${c}/extids.txt 
|| true"
+        on_exit "podman cp $c:/var/log/ovn/. ${c}"
+        on_exit "podman cp $c:/var/log/openvswitch/. ${c}"
+        on_exit "podman cp $c:/etc/ovn/. ${c}"
+        on_exit "podman cp $c:/etc/openvswitch/. ${c}"
+    done
 }
 
 cleanup_multinode_resources_by_nodes() {
-- 
2.51.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to