X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fcontainer.robot;h=15bcad799943d64dbf130859e7b7840ae6bb1b80;hp=6067a81c4eb4b7599438b9ac67c0945434cc6749;hb=14dc85d180558fe6a3573247fb62e280ba3b328c;hpb=533fcfe3d177447aee7a3dca5f0d7a5f06d70377

diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot
index 6067a81c4e..15bcad7999 100644
--- a/resources/libraries/robot/shared/container.robot
+++ b/resources/libraries/robot/shared/container.robot
@@ -56,12 +56,13 @@
 | | | ${root}= | Run Keyword If | ${dut1_uuid_length}
 | | | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${dut1_uuid}
 | | | ... | ELSE | Set Variable | ${EMPTY}
+| | | ${node_arch}= | Get Node Arch | ${nodes['${dut}']}
 | | | ${mnt}= | Create List
 | | | ... | ${root}/tmp/:/mnt/host/
 | | | ... | ${root}/dev/vfio/:/dev/vfio/
 | | | ... | ${root}/usr/bin/vpp:/usr/bin/vpp
 | | | ... | ${root}/usr/bin/vppctl:/usr/bin/vppctl
-| | | ... | ${root}/usr/lib/x86_64-linux-gnu/:/usr/lib/x86_64-linux-gnu/
+| | | ... | ${root}/usr/lib/${node_arch}-linux-gnu/:/usr/lib/${node_arch}-linux-gnu/
 | | | ... | ${root}/usr/share/vpp/:/usr/share/vpp/
 | | | ${nf_cpus}= | Set Variable | ${None}
 | | | ${nf_cpus}= | Run Keyword If | ${pinning}
@@ -216,3 +217,4 @@
 | | Configure VPP in all '${container_group}' containers
 | | Start VPP in all '${container_group}' containers
 | | Append To List | ${container_groups} | ${container_group}
+| | Save VPP PIDs