FIX: Memif socket files + docker image

Fix after broken cherry-pick
Fix after bumb of Ubuntu images on dockerhub

Change-Id: I3ea5e9871b8e31aa5a9e72336f7ba8aa1d7476c5
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 023e9a4..97ca356 100644 (file)
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -2150,8 +2150,8 @@
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
 | | Set Interface State | ${dut2} | ${dut2_if2} | up
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
-| | | ${sock1}= | Set Variable | memif-DUT1_VNF
-| | | ${sock2}= | Set Variable | memif-DUT1_VNF
+| | | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1
+| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2
 | | | ${prev_index}= | Evaluate | ${number}-1
 | | | Set up memif interfaces on DUT node | ${dut1}
 | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1
@@ -2160,8 +2160,8 @@
 | | | ... | ${dut1-memif-${prev_index}-if2}
 | | | Configure L2XC | ${dut1} | ${dut1_xconnect_if1}
 | | | ... | ${dut1-memif-${number}-if1}
-| | | ${sock1}= | Set Variable | memif-DUT2_VNF
-| | | ${sock2}= | Set Variable | memif-DUT2_VNF
+| | | ${sock1}= | Set Variable | /tmp/memif-DUT2_VNF${number}-1
+| | | ${sock2}= | Set Variable | /tmp/memif-DUT2_VNF${number}-2
 | | | Set up memif interfaces on DUT node | ${dut2}
 | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1
 | | | ... | dut2-memif-${number}-if2

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 908180d..92b18f5 100644 (file)
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -56,7 +56,7 @@
 # LXC container
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
-| ${container_image}= | ubuntu
+| ${container_image}= | ubuntu:xenial-20180412
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
index 6f5f4fd..edf78bb 100644 (file)
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
@@ -64,7 +64,7 @@
 # LXC container
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
-| ${container_image}= | ubuntu
+| ${container_image}= | ubuntu:xenial-20180412
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}

diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 23a12d0..1faa0bf 100644 (file)
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -56,7 +56,7 @@
 # LXC container
 | ${container_count}= | ${1}
 | ${container_engine}= | Docker
-| ${container_image}= | ubuntu
+| ${container_image}= | ubuntu:xenial-20180412
 # CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}