If podman cp is copying a file being updated, it might result in errors
such as "1 error occurred: * copying from container: copier: get:"

Fixes: 4756ed2f63d2 ("tests: Collect the relevant artifacts after each 
multinode test.")
Signed-off-by: Xavier Simonart <[email protected]>
---
 tests/multinode-macros.at | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at
index 759ec09bb..4a74d5127 100644
--- a/tests/multinode-macros.at
+++ b/tests/multinode-macros.at
@@ -185,10 +185,13 @@ check_fake_multinode_setup_by_nodes() {
 
 save_logs_and_db() {
     c=$1
-    on_exit "podman cp $c:/var/log/ovn/. ${c}"
+    # Note that on_exit commands are executed in reverse order during cleanup.
+    on_exit "podman cp $c:/tmp/ovn/. ${c}"
     on_exit "podman cp $c:/tmp/openvswitch/. ${c}"
-    on_exit "podman cp $c:/etc/ovn/. ${c}"
-    on_exit "podman cp $c:/etc/openvswitch/. ${c}"
+    on_exit "podman exec $c cp -r /var/log/ovn/ /tmp/"
+    on_exit "podman exec $c cp -r /var/log/openvswitch/ /tmp/"
+    on_exit "podman exec $c cp -r /etc/ovn/ /tmp/"
+    on_exit "podman exec $c cp -r /etc/openvswitch/ /tmp/"
 }
 
 check_fake_multinode_setup() {
-- 
2.47.1

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

Reply via email to