fix(infra): New AWS images 30/42130/3
authorPeter Mikus <[email protected]>
Fri, 10 Jan 2025 11:29:36 +0000 (12:29 +0100)
committerPeter Mikus <[email protected]>
Fri, 10 Jan 2025 11:33:12 +0000 (11:33 +0000)
Signed-off-by: Peter Mikus <[email protected]>
Change-Id: Ibd1892cfc57b9c172fa9a08e39d704c1a812ad3d

29 files changed:
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml
fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml
fdio.infra.ansible/roles/docker_images/tasks/main.yaml
fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf
fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf
fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf
fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf

index 8179451..8ac5bd0 100644 (file)
@@ -35,11 +35,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 1a269d6..d130d39 100644 (file)
@@ -35,12 +35,6 @@ intel_qat_matrix: true
 
 docker_sut: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/dev/null"
     target: "/etc/sysctl.d/80-vpp.conf"
   - source: "/opt/boot/"
index 3dc853a..9b8d4e6 100644 (file)
@@ -36,11 +36,5 @@ intel_qat_matrix: true
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 7d7fb29..068fc64 100644 (file)
@@ -35,12 +35,6 @@ intel_qat_matrix: true
 
 docker_sut: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/dev/null"
     target: "/etc/sysctl.d/80-vpp.conf"
   - source: "/opt/boot/"
index 4cb3dd7..b29ccc6 100644 (file)
@@ -35,11 +35,5 @@ intel_qat_matrix: true
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 55709c1..3983115 100644 (file)
@@ -37,12 +37,6 @@ docker_sut: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/dev/null"
     target: "/etc/sysctl.d/80-vpp.conf"
   - source: "/opt/boot/"
index 3c149ad..10a7369 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 1567d7e..07c1d26 100644 (file)
@@ -35,16 +35,12 @@ intel_qat_matrix: true
 
 docker_sut: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/dev/null"
     target: "/etc/sysctl.d/80-vpp.conf"
   - source: "/opt/boot/"
     target: "/opt/boot/"
+  - source: "/opt/dpdk-24.07/"
+    target: "/opt/dpdk-24.07/"
   - source: "/usr/bin/iperf3"
     target: "/usr/bin/iperf3"
   - source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0"
index 133ea10..9f824b5 100644 (file)
@@ -35,11 +35,5 @@ intel_qat_matrix: true
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 5a8fe6e..45837a6 100644 (file)
@@ -38,11 +38,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 062b90a..bf2b17a 100644 (file)
@@ -38,11 +38,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 7b89421..344108c 100644 (file)
@@ -33,11 +33,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
index f1da8fe..e6b2f48 100644 (file)
@@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07"
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index fa86f2f..c06ae26 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
index 82891ba..e0c84f4 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index b8a42b5..9f9eb9b 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index 099287b..c743c08 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
index 5baea52..ee03a4b 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index e3cb0e8..300515c 100644 (file)
@@ -37,11 +37,5 @@ docker_tg: true
 docker_volumes:
   - source: "/usr/bin/ofed_info"
     target: "/usr/bin/ofed_info"
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index fe11858..0a356df 100644 (file)
@@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07"
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
index 6b12916..3bd4664 100644 (file)
@@ -33,11 +33,5 @@ intel_800_matrix: "dpdk24.07"
 
 docker_tg: true
 docker_volumes:
-  - source: "/dev/hugepages"
-    target: "/dev/hugepages"
-  - source: "/dev/vfio"
-    target: "/dev/vfio"
-  - source: "/etc/sudoers"
-    target: "/etc/sudoers"
   - source: "/usr/lib/firmware/"
     target: "/usr/lib/firmware/"
\ No newline at end of file
index e6171a2..382c70b 100644 (file)
@@ -1,12 +1,12 @@
 ---
 # file: tasks/main.yaml
 
-#- name: "Build Base Docker Images"
-#  import_tasks: "base.yaml"
-#  when: >
-#    inventory_hostname in groups["sut"]
-#  tags:
-#    - docker-base
+- name: "Build Base Docker Images"
+  import_tasks: "base.yaml"
+  when: >
+    inventory_hostname in groups["sut"]
+  tags:
+    - docker-base
 
 - name: "Docker Orchestration for TG"
   import_tasks: "tg.yaml"
index 8103745..10532fc 100644 (file)
@@ -16,6 +16,15 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+      - type: "bind"
+        source: "/dev/hugepages"
+        target: "/dev/hugepages"
+      - type: "bind"
+        source: "/dev/vfio"
+        target: "/dev/vfio"
+      - type: "bind"
+        source: "/etc/sudoers"
+        target: "/etc/sudoers"
 {% for volume in docker_volumes %}
       - type: "bind"
         source: "{{ volume.source }}"
@@ -38,6 +47,15 @@ services:
     restart: "always"
     shm_size: "4G"
     volumes:
+      - type: "bind"
+        source: "/dev/hugepages"
+        target: "/dev/hugepages"
+      - type: "bind"
+        source: "/dev/vfio"
+        target: "/dev/vfio"
+      - type: "bind"
+        source: "/etc/sudoers"
+        target: "/etc/sudoers"
 {% for volume in docker_volumes %}
       - type: "bind"
         source: "{{ volume.source }}"
index c4d53c9..9b03c65 100644 (file)
@@ -17,8 +17,17 @@ services:
     privileged: true
     restart: "always"
     shm_size: "4G"
-{% if docker_volumes is defined and docker_volumes|length > 0 %}
     volumes:
+      - type: "bind"
+        source: "/dev/hugepages"
+        target: "/dev/hugepages"
+      - type: "bind"
+        source: "/dev/vfio"
+        target: "/dev/vfio"
+      - type: "bind"
+        source: "/etc/sudoers"
+        target: "/etc/sudoers"
+{% if docker_volumes is defined and docker_volumes|length > 0 %}
 {% for volume in docker_volumes %}
       - type: "bind"
         source: "{{ volume.source }}"
@@ -43,8 +52,17 @@ services:
     privileged: true
     restart: "always"
     shm_size: "4G"
-{% if docker_volumes is defined and docker_volumes|length > 0 %}
     volumes:
+      - type: "bind"
+        source: "/dev/hugepages"
+        target: "/dev/hugepages"
+      - type: "bind"
+        source: "/dev/vfio"
+        target: "/dev/vfio"
+      - type: "bind"
+        source: "/etc/sudoers"
+        target: "/etc/sudoers"
+{% if docker_volumes is defined and docker_volumes|length > 0 %}
 {% for volume in docker_volumes %}
       - type: "bind"
         source: "{{ volume.source }}"
index 7b054d5..43002d1 100644 (file)
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-04f5fbbd9880e691a"
+  default     = "ami-06ea2ad776e2a8461"
 }
 
 variable "tg_associate_public_ip_address" {
index efdbe91..923ae7f 100644 (file)
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-04f5fbbd9880e691a"
+  default     = "ami-06ea2ad776e2a8461"
 }
 
 variable "tg_associate_public_ip_address" {
index a498645..f85ae03 100644 (file)
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-04f5fbbd9880e691a"
+  default     = "ami-06ea2ad776e2a8461"
 }
 
 variable "tg_associate_public_ip_address" {
index b901fca..fea82b0 100644 (file)
@@ -50,7 +50,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-0c18f927fc6ac6c52"
+  default     = "ami-06ea2ad776e2a8461"
 }
 
 variable "tg_associate_public_ip_address" {
index 0cc9252..41fceda 100644 (file)
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-04f5fbbd9880e691a"
+  default     = "ami-06ea2ad776e2a8461"
 }
 
 variable "tg_associate_public_ip_address" {