Revert "fix(packer): Update AWS image"

This reverts commit 980263450cab4b4d2f8cbf6493534cf8561c4721.

Reason for revert: .

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

diff --git a/fdio.infra.ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml
index a9d19b4..b5132c1 100644 (file)
--- a/fdio.infra.ansible/roles/aws/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml
@@ -6,24 +6,24 @@
   tags:
     - aws-edit-repo
 
-#- name: Prerequisites
-#  ansible.builtin.package:
-#    name: "{{ packages | flatten(levels=1) }}"
-#    state: "latest"
-#  tags:
-#    - aws-inst-prerequisites
+- name: Prerequisites
+  ansible.builtin.package:
+    name: "{{ packages | flatten(levels=1) }}"
+    state: "latest"
+  tags:
+    - aws-inst-prerequisites
 
-#- name: Switch Kernel At Boot
-#  ansible.builtin.lineinfile:
-#    path: "/etc/default/grub"
-#    state: "present"
-#    line: "GRUB_DEFAULT=\"1>2\""
-#  notify:
-#  - "Update GRUB"
-#  tags:
-#  - perf-conf-grub
+- name: Switch Kernel At Boot
+  ansible.builtin.lineinfile:
+    path: "/etc/default/grub"
+    state: "present"
+    line: "GRUB_DEFAULT=\"1>2\""
+  notify:
+    - "Update GRUB"
+  tags:
+    - perf-conf-grub
 
-#- meta: flush_handlers
+- meta: flush_handlers
 
 - name: Load Kernel Modules By Default
   ansible.builtin.lineinfile:
@@ -47,16 +47,16 @@
   tags:
     - aws-load-kernel-modules
 
-#- name: Add Kernel Modules Options (vfio-pci)
-#  ansible.builtin.lineinfile:
-#    path: "/etc/modprobe.d/vfio-noiommu.conf"
-#    state: "present"
-#    line: "{{ item }}"
-#    create: "yes"
-#  with_items:
-#    - "options vfio enable_unsafe_noiommu_mode=1"
-#  tags:
-#    - aws-load-kernel-modules
+- name: Add Kernel Modules Options (vfio-pci)
+  ansible.builtin.lineinfile:
+    path: "/etc/modprobe.d/vfio-noiommu.conf"
+    state: "present"
+    line: "{{ item }}"
+    create: "yes"
+  with_items:
+    - "options vfio enable_unsafe_noiommu_mode=1"
+  tags:
+    - aws-load-kernel-modules
 
 #- name: Get vfio-pci With WC Patcher
 #  ansible.builtin.get_url:
@@ -65,41 +65,41 @@
 #    mode: 0744
 #  tags:
 #    - aws-vfio-patch
-#
-#- name: Create vfio-pci Patch Directory
-#  ansible.builtin.file:
-#    path: "/opt/patches/"
-#    state: "directory"
-#  tags:
-#    - aws-vfio-patch
-#
-#- name: Get vfio-pci WC Patch
-#  ansible.builtin.get_url:
-#    url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/{{ item }}"
-#    dest: "/opt/patches/{{ item }}"
-#    mode: 0744
-#  with_items:
-#    - "linux-4.10-vfio-wc.patch"
-#    - "linux-5.8-vfio-wc.patch"
-#    - "linux-5.15-vfio-wc.patch"
-#  tags:
-#    - aws-vfio-patch
-#
-#- name: Copy vfio-pci WC Patch
-#  ansible.builtin.copy:
-#    src: "files/get-vfio-with-wc.sh"
-#    dest: "/opt"
-#    mode: 0744
-#  tags:
-#    - aws-vfio-patch
-#
-#- name: Compile vfio-pci With WC Patch
-#  ansible.builtin.shell: "/bin/bash /opt/get-vfio-with-wc.sh"
-#  environment:
-#    DEBIAN_FRONTEND: "noninteractive"
-#    TERM: "vt100"
-#  tags:
-#    - aws-vfio-patch
+
+- name: Create vfio-pci Patch Directory
+  ansible.builtin.file:
+    path: "/opt/patches/"
+    state: "directory"
+  tags:
+    - aws-vfio-patch
+
+- name: Get vfio-pci WC Patch
+  ansible.builtin.get_url:
+    url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/{{ item }}"
+    dest: "/opt/patches/{{ item }}"
+    mode: 0744
+  with_items:
+    - "linux-4.10-vfio-wc.patch"
+    - "linux-5.8-vfio-wc.patch"
+    - "linux-5.15-vfio-wc.patch"
+  tags:
+    - aws-vfio-patch
+
+- name: Copy vfio-pci WC Patch
+  ansible.builtin.copy:
+    src: "files/get-vfio-with-wc.sh"
+    dest: "/opt"
+    mode: 0744
+  tags:
+    - aws-vfio-patch
+
+- name: Compile vfio-pci With WC Patch
+  ansible.builtin.shell: "/bin/bash /opt/get-vfio-with-wc.sh"
+  environment:
+    DEBIAN_FRONTEND: "noninteractive"
+    TERM: "vt100"
+  tags:
+    - aws-vfio-patch
 
 - name: Reload systemd-modules
   ansible.builtin.systemd:

diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
index 9593305..1a747f6 100644 (file)
--- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
+++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
@@ -46,17 +46,17 @@
   retries: 300
   when: trex_extracted.changed
 
-#- name: Compile Release {{ item }} Part III
-#  ansible.builtin.command: "make -j 16"
-#  args:
-#    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
-#  when: trex_extracted.changed
-
-#- name: Compile Release {{ item }} Part IV
-#  ansible.builtin.command: "make install"
-#  args:
-#    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
-#  when: trex_extracted.changed
+- name: Compile Release {{ item }} Part III
+  ansible.builtin.command: "make -j 16"
+  args:
+    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
+  when: trex_extracted.changed
+
+- name: Compile Release {{ item }} Part IV
+  ansible.builtin.command: "make install"
+  args:
+    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
+  when: trex_extracted.changed
 
 - name: Link libc.a to liblibc.a
   ansible.builtin.command: "ln -s -f /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/liblibc.a"

diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
index 4691a07..51af958 100644 (file)
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
@@ -50,7 +50,7 @@ variable "placement_group_strategy" {
 variable "tg_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-0b156cada4f639c46"
+  default     = "ami-07430bfa17fd4e597"
 }
 
 variable "tg_associate_public_ip_address" {
@@ -86,7 +86,7 @@ variable "tg_source_dest_check" {
 variable "sut1_ami" {
   description = "AMI to use for the instance."
   type        = string
-  default     = "ami-0aaed4424cfea9a24"
+  default     = "ami-0a890555652963ec2"
 }
 
 variable "sut1_associate_public_ip_address" {

diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
index 46f5822..7293d17 100644 (file)
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
@@ -60,7 +60,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
   force_deregister = true
   region           = "eu-central-1"
   skip_create_ami  = false
-  source_ami       = "ami-026c3177c9bd54288"
+  source_ami       = "ami-04e601abe3e1a910f"
   ssh_username     = "ubuntu"
 }
 
@@ -77,7 +77,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
   force_deregister = true
   region           = "eu-central-1"
   skip_create_ami  = false
-  source_ami       = "ami-026c3177c9bd54288"
+  source_ami       = "ami-04e601abe3e1a910f"
   ssh_username     = "ubuntu"
 }
 
@@ -92,10 +92,10 @@ build {
   provisioner "ansible" {
     playbook_file = var.ansible_file_path
     user          = "ubuntu"
-    use_proxy     = false
     groups        = ["sut_aws"]
     extra_arguments = [
       "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}",
+      "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}",
       "--extra-vars", "aws=true"
     ]
   }
@@ -115,10 +115,10 @@ build {
   provisioner "ansible" {
     playbook_file = var.ansible_file_path
     user          = "ubuntu"
-    use_proxy     = false
     groups        = ["tg_aws"]
     extra_arguments = [
       "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}",
+      "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}",
       "--extra-vars", "aws=true"
     ]
   }