diff options
Diffstat (limited to 'fdio.infra.ansible')
-rw-r--r-- | fdio.infra.ansible/roles/trex/defaults/main.yaml | 4 | ||||
-rw-r--r-- | fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml | 36 | ||||
-rw-r--r-- | fdio.infra.ansible/roles/trex/tasks/main.yaml | 2 |
3 files changed, 4 insertions, 38 deletions
diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index 804b1f3b3f..18a2b56bda 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/defaults/main.yaml +# file: defaults/main.yaml packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" @@ -30,4 +30,4 @@ packages_by_arch: trex_target_dir: "/opt" trex_url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/" trex_version: - - "3.00" + - "3.03" diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index 23948bc158..1a747f68d5 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/tasks/deploy_block.yaml +# file: tasks/deploy_block.yaml - name: Get Release {{ item }} ansible.builtin.get_url: @@ -22,32 +22,6 @@ creates: "{{ trex_target_dir }}/trex-core-{{ item }}/linux_dpdk/" register: trex_extracted -- name: Patch Azure - ansible.builtin.patch: - src: "files/t-rex.patch" - basedir: "{{ trex_target_dir }}/trex-core-{{ item }}" - strip: 1 - when: - - azure is defined and item == "2.73" - -- 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 - ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9" - when: trex_extracted.changed - -- name: Switch to g++-9 - ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9" - when: trex_extracted.changed - - name: Compile Release {{ item }} Part I ansible.builtin.command: "./b configure" args: @@ -72,14 +46,6 @@ retries: 300 when: trex_extracted.changed -- name: Switch to gcc-11 - ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11" - when: trex_extracted.changed - -- name: Switch to g++-11 - ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11" - when: trex_extracted.changed - - name: Compile Release {{ item }} Part III ansible.builtin.command: "make -j 16" args: diff --git a/fdio.infra.ansible/roles/trex/tasks/main.yaml b/fdio.infra.ansible/roles/trex/tasks/main.yaml index 5cdf041a14..d0509f7544 100644 --- a/fdio.infra.ansible/roles/trex/tasks/main.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/main.yaml @@ -1,5 +1,5 @@ --- -# file: roles/trex/tasks/main.yaml +# file: tasks/main.yaml - name: Update Package Cache (APT) ansible.builtin.apt: |