fix(infra): Varius issues

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I9c5899deba994b8683f7cc0596ebb2d59a611f8e

diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
index 590ba76..c73e34a 100644 (file)
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
@@ -7,7 +7,9 @@ services:
         BASE_IMAGE: "ubuntu:22.04"
         TREX_VERSION: "3.03"
         IPERF_VERSION: "3.7"
-    command: ["/usr/sbin/sshd","-D", "-p", "6001"]
+    command: ["sh", "-c", "env | grep LD_ >> /etc/environment && /usr/sbin/sshd -D -p 6001"]
+    environment:
+      - LD_LIBRARY_PATH=/usr/local/lib/
     expose:
       - "6001"
     hostname: "{{ ansible_hostname }}"
@@ -29,7 +31,9 @@ services:
         BASE_IMAGE: "ubuntu:22.04"
         TREX_VERSION: "3.03"
         IPERF_VERSION: "3.7"
-    command: ["/usr/sbin/sshd","-D", "-p", "6002"]
+    command: ["sh", "-c", "env | grep LD_ >> /etc/environment && /usr/sbin/sshd -D -p 6002"]
+    environment:
+      - LD_LIBRARY_PATH=/usr/local/lib/
     expose:
       - "6002"
     hostname: "{{ ansible_hostname }}"

diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml
index 1bfc0b6..bd31351 100644 (file)
--- a/fdio.infra.ansible/roles/intel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml
@@ -57,12 +57,12 @@ intel_800_compatibility_matrix:
   dpdk24.07:
     # https://doc.dpdk.org/guides/rel_notes/release_24_07.html
     ice: "1.14.13"
-    ddp: "1.3.45.0"
+    ddp: "1.3.46.0"
     iavf: "4.11.3"
     nvm: "4.50"
 
 intel_dsa_compatibility_matrix:
-  dsa: "4.0"
+  dsa: "4.1.8"
 
 intel_qat_compatibility_matrix:
   qat2: "1.1.50-00003"
@@ -78,10 +78,10 @@ intel_iavf_url:
   "4.11.3": "iavf%20stable/4.11.3/iavf-4.11.3.tar.gz/download"
 
 intel_ddp_url:
-  "1.3.45.0": "785846/738693_ice_comms-1.3.45.0.zip"
+  "1.3.46.0": "823031/ice_comms-1.3.46.0.zip"
 
 intel_dsa_url:
-  "4.0": "https://github.com/intel/idxd-config/archive/refs/tags/accel-config-v4.0.tar.gz"
+  "4.1.8": "https://github.com/intel/idxd-config/archive/refs/tags/accel-config-v4.1.8.tar.gz"
 
 intel_qat_url:
   "1.1.50-00003": "822703/QAT20.L.1.1.50-00003.tar.gz"

diff --git a/fdio.infra.ansible/roles/intel/tasks/ice.yaml b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
index c773a65..72a78a8 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/ice.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
@@ -54,15 +54,6 @@
   tags:
     - intel-inst
 
-- name: Extract Dynamic Device Personalization (DDP) Package
-  ansible.builtin.unarchive:
-    remote_src: true
-    src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.zip"
-    dest: "{{ intel_extract_dir }}/"
-  register: intel_driver_extracted
-  tags:
-    - intel-inst
-
 - name: Copy Dynamic Device Personalization (DDP) Package
   ansible.builtin.copy:
     src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.pkg"

diff --git a/fdio.infra.ansible/roles/intel/tasks/main.yaml b/fdio.infra.ansible/roles/intel/tasks/main.yaml
index d7598de..bcc8cfd 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/main.yaml
@@ -137,10 +137,10 @@
   tags:
     - intel-inst-drivers
 
-- name: Driver Intel QAT 2.x
-  import_tasks: qat2.yaml
-  when: >
-    intel_qat2_pcis.stdout_lines | length > 0 and
-    intel_qat_matrix is defined
-  tags:
-    - intel-inst-drivers
\ No newline at end of file
+#- name: Driver Intel QAT 2.x
+#  import_tasks: qat2.yaml
+#  when: >
+#    intel_qat2_pcis.stdout_lines | length > 0 and
+#    intel_qat_matrix is defined
+#  tags:
+#    - intel-inst-drivers
\ No newline at end of file

diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
index 4ae9add..dbe510e 100644 (file)
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4
@@ -1,4 +1,4 @@
 menuentry "Install s73-t34-sut2" {
-    linux    /casper/ubuntu-noble-arm64/vmlinuz ip=:::::enp1s0f0:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:49:db:b4/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:49:db:b4/ ---
     initrd   /casper/ubuntu-noble-arm64/initrd
 }
\ No newline at end of file

diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
index 9aa42d9..2f55b12 100644 (file)
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32
@@ -1,4 +1,4 @@
 menuentry "Install s72-t34-sut1" {
-    linux    /casper/ubuntu-noble-arm64/vmlinuz ip=:::::enp1s0f0:dhcp url=https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:55:be:32/ --- console=ttyAMA0,115200n8 quiet
+    linux    /casper/ubuntu-noble-arm64/vmlinuz ip=::::eno1::dhcp url=https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:55:be:32/ ---
     initrd   /casper/ubuntu-noble-arm64/initrd
 }
\ No newline at end of file

diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data
index 01385f0..47c27c4 100644 (file)
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data
@@ -89,7 +89,7 @@ autoinstall:
   locale: en_US.UTF-8
   network:
     ethernets:
-      enP2p1s0v0:
+      enp1s0f0:
         addresses: [ 10.30.51.73/24 ]
         dhcp4: false
         gateway4: 10.30.51.1

diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data
index 89f034d..d593e57 100644 (file)
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data
@@ -89,7 +89,7 @@ autoinstall:
   locale: en_US.UTF-8
   network:
     ethernets:
-      enP2p1s0v0:
+      enp1s0f0:
         addresses: [ 10.30.51.72/24 ]
         dhcp4: false
         gateway4: 10.30.51.1

diff --git a/resources/libraries/python/DMAUtil.py b/resources/libraries/python/DMAUtil.py
index 0c0ed3c..cce60ed 100644 (file)
--- a/resources/libraries/python/DMAUtil.py
+++ b/resources/libraries/python/DMAUtil.py
@@ -136,7 +136,8 @@ class DMAUtil:
                 f" --wq-size={wq_size} --mode=dedicated " \
                 f" --name={dma_name}_{i} " \
                 f" --max-batch-size={max_batch_size} " \
-                f" --max-transfer-size={max_transfer_size} "
+                f" --max-transfer-size={max_transfer_size} " \
+                f" --driver=idxd"
 
             exec_cmd_no_error(
                 node, cmd, sudo=True,