From cf8bdf81dd362d7bc20b63644ca0f9e90550abef Mon Sep 17 00:00:00 2001 From: Alberto Losada Date: Tue, 22 Feb 2022 12:44:06 +0100 Subject: [PATCH] Changes to trex Signed-off-by: Alberto Losada --- Dockerfile-trex | 4 ++-- pods/dpdk/trex/trex.yaml | 6 ++++-- scripts/create-trex-config.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile-trex b/Dockerfile-trex index 471e0ef..bb043ef 100644 --- a/Dockerfile-trex +++ b/Dockerfile-trex @@ -1,6 +1,6 @@ -FROM quay.io/centos/centos:8 +FROM quay.io/centos/centos:stream8 -ARG TREX_VERSION=2.87 +ARG TREX_VERSION=2.95 ENV TREX_VERSION ${TREX_VERSION} # install requirements diff --git a/pods/dpdk/trex/trex.yaml b/pods/dpdk/trex/trex.yaml index 16c8dca..69cdfce 100644 --- a/pods/dpdk/trex/trex.yaml +++ b/pods/dpdk/trex/trex.yaml @@ -13,7 +13,9 @@ data: trex_cfg.yaml : | - port_limit: 2 version: 2 - interfaces: ["${PCIDEVICE_OPENSHIFT_IO_DPDK_NIC_1}","${PCIDEVICE_OPENSHIFT_IO_DPDK_NIC_2}"] + interfaces: + - ${PCIDEVICE_OPENSHIFT_IO_DPDK_NIC_1} + - ${PCIDEVICE_OPENSHIFT_IO_DPDK_NIC_2} port_bandwidth_gb: ${PORT_BANDWIDTH_GB} port_info: - ip: 10.10.10.2 @@ -300,4 +302,4 @@ spec: name: trex-tests - emptyDir: medium: HugePages - name: hugepages \ No newline at end of file + name: hugepages diff --git a/scripts/create-trex-config.sh b/scripts/create-trex-config.sh index 168678a..4778676 100755 --- a/scripts/create-trex-config.sh +++ b/scripts/create-trex-config.sh @@ -17,7 +17,7 @@ done CPU="${CPU:1}" echo $CPU -NODE=`lscpu | grep ${MASTER} | awk '/node0/{print "0"}{print "1"}'` +NODE=`lscpu | grep ${MASTER}, | awk '/node0/{print "0"}{print "1"}'` export SOCKET="0" if [[ ${NODE} -eq 1 ]] then