diff options
Diffstat (limited to 'fdio.infra.ansible/roles/trex')
| -rw-r--r-- | fdio.infra.ansible/roles/trex/defaults/main.yaml | 29 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml | 2 |
2 files changed, 16 insertions, 15 deletions
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 |