From 53f708831021068e8a63d876819d571fc337d1d7 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 15 Apr 2025 13:59:30 +0200 Subject: [PATCH] feat(infra): emr fixes Signed-off-by: Peter Mikus Change-Id: If426e4793e1aed2738681146ce09142b967c9e91 --- .../inventories/lf_inventory/host_vars/10.30.51.40.yaml | 12 +++++++----- .../inventories/lf_inventory/host_vars/10.30.51.42.yaml | 12 +++++++----- fdio.infra.ansible/roles/docker_images/files/base/Dockerfile | 3 ++- .../roles/docker_images/templates/docker-compose-sut.yaml.j2 | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml index 55f5948b03..c63e7b15c3 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml @@ -54,11 +54,13 @@ docker_volumes: target: "/usr/lib/firmware/" - source: "/usr/local/bin/adf_ctl" target: "/usr/local/bin/adf_ctl" + - source: "/usr/bin/accel-config" + target: "/usr/bin/accel-config" + - source: "/usr/lib64/libaccel-config.so.1" + target: "/usr/lib64/libaccel-config.so.1" + - source: "/etc/accel-config" + target: "/etc/accel-config" - source: "/etc/4xxx_dev0.conf" target: "/etc/4xxx_dev0.conf" - source: "/etc/4xxx_dev1.conf" - target: "/etc/4xxx_dev1.conf" - - source: "/etc/4xxx_dev2.conf" - target: "/etc/4xxx_dev2.conf" - - source: "/etc/4xxx_dev3.conf" - target: "/etc/4xxx_dev3.conf" \ No newline at end of file + target: "/etc/4xxx_dev1.conf" \ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml index f73feeee4f..c68b10d0c3 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml @@ -54,11 +54,13 @@ docker_volumes: target: "/usr/lib/firmware/" - source: "/usr/local/bin/adf_ctl" target: "/usr/local/bin/adf_ctl" + - source: "/usr/local/bin/adf_ctl" + target: "/usr/local/bin/adf_ctl" + - source: "/usr/bin/accel-config" + target: "/usr/bin/accel-config" + - source: "/usr/lib64/libaccel-config.so.1" + target: "/usr/lib64/libaccel-config.so.1" - source: "/etc/4xxx_dev0.conf" target: "/etc/4xxx_dev0.conf" - source: "/etc/4xxx_dev1.conf" - target: "/etc/4xxx_dev1.conf" - - source: "/etc/4xxx_dev2.conf" - target: "/etc/4xxx_dev2.conf" - - source: "/etc/4xxx_dev3.conf" - target: "/etc/4xxx_dev3.conf" \ No newline at end of file + target: "/etc/4xxx_dev1.conf" \ No newline at end of file diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile index b860f1e6e2..a08b82f89b 100644 --- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile +++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile @@ -142,7 +142,8 @@ RUN python3 -m venv venv \ tomli==2.0.1 \ tomlkit==0.13.0 \ typing_extensions==4.12.2 \ - urllib3==2.2.2 + urllib3==2.2.2\ + meson==0.64.1 RUN useradd -rm -d /home/testuser -s /bin/bash -g 1000 -G sudo testuser \ && echo 'testuser:Csit1234' | chpasswd diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 index 10532fcfde..da74c78241 100644 --- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 +++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 @@ -14,7 +14,7 @@ services: network_mode: "host" privileged: true restart: "always" - shm_size: "4G" + shm_size: "8G" volumes: - type: "bind" source: "/dev/hugepages" @@ -45,7 +45,7 @@ services: network_mode: "host" privileged: true restart: "always" - shm_size: "4G" + shm_size: "8G" volumes: - type: "bind" source: "/dev/hugepages" -- 2.16.6