🐎 ci:Make adjustments to the trex helmchart file and the build process.

ansible/install_config/group_vars/rpm_version.yml

@@ -111,7 +111,7 @@ packet_adapter_rpm_version:
   packet_adapter: packet_adapter-2.0.2.4f48b59
 
 nic_uio_binder_rpm_version:
-  nic_uio_binder: nic-uio-binder-1.0.9-5408921
+  nic_uio_binder: nic-uio-binder-1.0.10-c67fa3b
 
 dp_trace_rpm_version:
   dp_trace: dp_trace_telemetry-0.1.16.e2200bb

ansible/roles/k3s-install/files/nic-uio-binder.yaml

@@ -16,12 +16,12 @@ spec:
     spec:
       containers:
       - name: nic-uio-binder
-        image: registry.gdnt-cloud.website/tsg-nic-uio-binder:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
+        image: registry.gdnt-cloud.website/tsg-nic-uio-binder:%%NIC_UIO_BINDER_IMAGE_TAR%%
         command:
           - "bash"
           - "-ec"
           - |
-            /opt/tsg/nic-uio-binder/bin/deviceplugin 
+            /opt/tsg/nic-uio-binder/bin/nic-uio-binder
         volumeMounts:
         - name: hwfile
           mountPath: /var/run/mrzcpd
@@ -35,7 +35,7 @@ spec:
           privileged: true
       initContainers:
       - name: init-nic-uio-binder
-        image: registry.gdnt-cloud.website/tsg-nic-uio-binder:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
+        image: registry.gdnt-cloud.website/tsg-nic-uio-binder:%%NIC_UIO_BINDER_IMAGE_TAR%%
         command: 
           - "bash"
           - "-ec"

ansible/roles/trex/files/generate-trex-conf.sh

@@ -11,6 +11,8 @@ for interface in "${arr[@]}"; do
   NIC_PCI+="\"$interface\""
 done
 
+port_limit=${#arr[@]}
+
 declare -A NUMA
 for cpu in ${CPU_AFFINITY[@]:2}; do
   numa_node=$(lscpu -p=CPU,NODE | grep "^$cpu," | cut -d',' -f2)
@@ -18,7 +20,7 @@ for cpu in ${CPU_AFFINITY[@]:2}; do
 done
 
 cat << EOF > /etc/trex_cfg.yaml
-- port_limit: 2
+- port_limit: $port_limit
   version: 2
   stack: legacy
   interfaces: [${NIC_PCI}]
@@ -56,10 +58,3 @@ for numa_node in "${!NUMA[@]}"; do
   echo "        threads: [${threads// /,}]" >> /etc/trex_cfg.yaml
   ((socket_id++))
 done
-
-cat << EOF >> /etc/trex_cfg.yaml
-  tw:
-    buckets: 2048
-    levels: 3
-    bucket_time_usec: 40.0
-EOF

ansible/roles/trex/files/helm/templates/deployment.yaml

@@ -17,13 +17,13 @@ spec:
       hostNetwork: true
       containers:
       - name: trex
-        image: registry.gdnt-cloud.website/trex::{{ .Chart.AppVersion }}
+        image: registry.gdnt-cloud.website/trex:{{ .Chart.AppVersion }}
         command: 
           - "bash"
           - "-ec"
           - |
-            chmod +x /host/root/test.sh
-            /host/root/test.sh
+            chmod +x /opt/tsg/trex/generate-trex-conf.sh
+            /opt/tsg/trex/generate-trex-conf.sh
             while true; do sleep 1024;done
         securityContext:
           privileged: true
@@ -42,6 +42,12 @@ spec:
         env:
         - name: CPU_AFFINITY
           value: {{ range $index, $cpu :=.Values.trex.cpu_affinity -}}{{- if eq $index 0 -}}{{$cpu}}{{- else -}},{{$cpu}}{{- end -}}{{- end }}
+        - name: TREX_PATH
+          value: /opt/tsg/trex/v3.02
+        - name: PBT_PATH
+          value: /opt/tsg/perf-bench-tool
+        - name: PYTHONPATH
+          value: /opt/tsg/trex/v3.02/automation/trex_control_plane/interactive/
         volumeMounts:
         - name: host
           mountPath: /host

ansible/roles/trex/tasks/main.yml

@@ -2,6 +2,10 @@
   shell: yum install -y lshw python3 which pciutils iproute vim kmod  libnl3-devel perl-generators iptables-devel numactl-libs
   when: runtime_env == 'TSG-X-P0906'
 
+- name: "Install pyyaml module"
+  shell: pip3 install pyyaml
+  when: runtime_env == 'TSG-X-P0906'
+
 - name: "Install  mlnx-ofed-user-space rpm package"
   yum:
     name: "{{ item.value }}"

make/Makefile.x86_64_COTS_APP_BUNDLE

@@ -5,7 +5,7 @@ PROFILE_ID_IN_SHORT				:= $(subst -,$e,$(PROFILE_ID))
 CONTAINER_IMAGES_TAR			:= traffic-engine-${OS_RELEASE_VER}-docker.tar
 TRAFFIC_ENGINE_HELM_CHART_TAR	:= traffic-engine-$(HELM_CHART_VER).tgz
 MRZCPD_HELM_CHART_TAR	        := mrzcpd-$(HELM_CHART_VER).tgz
-TREX_HELM_CHART_TAR	            := TREX-$(HELM_CHART_VER).tgz
+TREX_HELM_CHART_TAR	            := trex-$(HELM_CHART_VER).tgz
 DP_TRACE_HELM_CHART_TAR	        := datapath-trace-$(HELM_CHART_VER).tgz
 APP_BUNDLE_BIN					:= tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-APP-BUNDLE.bin
 INJECT_HELM_CHART_TAR           := inject-adapter-$(HELM_CHART_VER).tgz