fix(ansible): Jammy

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: Ib62bb38f07f4c12db330b6d6c1a09e6335f91b13

12 files changed, 30 insertions, 22 deletions

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml
index 71d4245580..867e0afc9f 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.78.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.78"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml
index d57803d525..237e6f804f 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.79.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.79"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml
index b1a5404498..d89998b0e6 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.80"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk21.02"
-intel_800_matrix: "dpdk21.02"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml
index f70c121bc3..d86f6db486 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.81.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.81"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk21.02"
-intel_800_matrix: "dpdk21.02"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml
index 828189d45d..9011920576 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.82"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml
index a1c5a81233..42046cfd8a 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.83.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.83"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk21.02"
-intel_800_matrix: "dpdk21.02"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml
index c9e998b8fa..c24b6ce28f 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.84"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml
index 31373e558c..11b6e2e836 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.85.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.85"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk21.02"
-intel_800_matrix: "dpdk21.02"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml
index 24f0f517af..ba42981e20 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.86"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml
index a00eab9c26..c346e42cfa 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.87.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.87"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk21.02"
-intel_800_matrix: "dpdk21.02"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml
index 3ab76b6952..ec80b876bf 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml
@@ -29,5 +29,5 @@ sysctl:
 inventory_ipmi_hostname: "10.30.50.88"
 cpu_microarchitecture: "icelake"
 
-intel_700_matrix: "dpdk22.03"
-intel_800_matrix: "dpdk22.03"
+intel_700_matrix: "dpdk22.07"
+intel_800_matrix: "dpdk22.07"
diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
index 70a80b43ea..d2fa2a3072 100644
--- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
+++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
@@ -30,6 +30,14 @@
   when:
     - azure is defined and item == "2.73"
 
+- name: Reset gcc-9
+  ansible.builtin.command: "update-alternatives --remove-all gcc"
+  when: trex_extracted.changed
+
+- name: Reset g++-9
+  ansible.builtin.command: "update-alternatives --remove-all g++"
+  when: trex_extracted.changed
+
 - name: Switch to gcc-9
   ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9"
   when: trex_extracted.changed