From 3887ba9733c250e327e9dc1c93b9d87e1bc7e749 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 5 Oct 2022 14:57:18 +0200 Subject: feat(trex): Bump T-Rex to v3.00 Signed-off-by: pmikus Change-Id: I9aa88fb094b03888fc30d84edc1deaa406075db4 --- fdio.infra.ansible/roles/intel/defaults/main.yaml | 33 +++++++++++----------- fdio.infra.ansible/roles/trex/defaults/main.yaml | 29 +++++++++---------- .../roles/trex/tasks/deploy_block.yaml | 2 ++ 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'fdio.infra.ansible') diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml index d4d8c4c514..b46fa3ebc0 100644 --- a/fdio.infra.ansible/roles/intel/defaults/main.yaml +++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml @@ -21,43 +21,42 @@ intel_download_url: "https://downloadmirror.intel.com" intel_extract_dir: "/opt" intel_700_compatibility_matrix: - dpdk21.02: - # https://doc.dpdk.org/guides/rel_notes/release_21_02.html - i40e: "2.14.13" - iavf: "4.1.1" - nvm: "8.00" + dpdk22.03: + # https://doc.dpdk.org/guides/rel_notes/release_22_03.html + i40e: "2.17.15" + iavf: "4.5.3" + nvm: "8.30" dpdk22.07: # https://doc.dpdk.org/guides/rel_notes/release_22_07.html i40e: "2.19.3" iavf: "4.5.3" - nvm: "8.30" + nvm: "8.70" intel_800_compatibility_matrix: - dpdk21.02: - # https://doc.dpdk.org/guides/rel_notes/release_21_02.html - ice: "1.4.11" - ddp: "1.3.28.0" - iavf: "4.1.1" - nvm: "2.40" + dpdk22.03: + # https://doc.dpdk.org/guides/rel_notes/release_22_03.html + ice: "1.8.3" + ddp: "1.3.35.0" + iavf: "4.5.3" + nvm: "3.20" dpdk22.07: # https://doc.dpdk.org/guides/rel_notes/release_22_07.html ice: "1.9.7" ddp: "1.3.37.0" iavf: "4.5.3" - nvm: "3.20" + nvm: "4.00" intel_i40e_url: - "2.14.13": "i40e%20stable/2.14.13/i40e-2.14.13.tar.gz/download" + "2.17.15": "i40e%20stable/2.17.15/i40e-2.17.15.tar.gz/download" "2.19.3": "i40e%20stable/2.19.3/i40e-2.19.3.tar.gz/download" intel_ice_url: - "1.4.11": "ice%20stable/1.4.11/ice-1.4.11.tar.gz/download" + "1.8.3": "ice%20stable/1.8.3/ice-1.8.3.tar.gz/download" "1.9.7": "ice%20stable/1.9.7/ice-1.9.7.tar.gz/download" intel_iavf_url: - "4.1.1": "iavf%20stable/4.1.1/iavf-4.1.1.tar.gz/download" "4.5.3": "iavf%20stable/4.5.3/iavf-4.5.3.tar.gz/download" intel_ddp_url: - "1.3.28.0": "30467/eng/800%20series%20comms%20binary%20package%201.3.28.0.zip" + "1.3.35.0": "727568/800%20Series%20DDP%20Comms%20Package%201.3.35.0.zip" "1.3.37.0": "738733/800%20Series%20DDP%20Comms%20Package%201.3.37.0.zip" diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index c09f5e5f85..804b1f3b3f 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -1,26 +1,25 @@ --- # file: roles/trex/defaults/main.yaml -packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}" +packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" packages_base: - [] packages_by_distro: ubuntu: - jammy: - - "build-essential" - - "gcc-9" - - "g++-9" - - "libmnl-dev" - - "libnuma-dev" - - "libpcap-dev" - - "librdmacm-dev" - - "librdmacm1" - - "libssl-dev" - - "pciutils" - - "python3-pip" - - "zlib1g-dev" + - "build-essential" + - "gcc-9" + - "g++-9" + - "libmnl-dev" + - "libnuma-dev" + - "libpcap-dev" + - "librdmacm-dev" + - "librdmacm1" + - "libssl-dev" + - "pciutils" + - "python3-pip" + - "zlib1g-dev" packages_by_arch: aarch64: @@ -31,4 +30,4 @@ packages_by_arch: trex_target_dir: "/opt" trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/" trex_version: - - "2.97" + - "3.00" diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index 492a56a65d..23948bc158 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -32,10 +32,12 @@ - name: Reset gcc-9 ansible.builtin.command: "update-alternatives --remove-all gcc" + ignore_errors: true when: trex_extracted.changed - name: Reset g++-9 ansible.builtin.command: "update-alternatives --remove-all g++" + ignore_errors: true when: trex_extracted.changed - name: Switch to gcc-9 -- cgit 1.2.3-korg