X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftrex%2Ftasks%2Fmain.yaml;h=d43baf909b2f87b6af30e8e0132d8dc0281fd31f;hp=11f51ddeac81494258748a2300c6e726e74ad3e8;hb=7b93e96740997dab4383140a639b055e074f63c1;hpb=8605f3f406468f57bb9b2eac12a4421f65965300

diff --git a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
index 11f51ddeac..d43baf909b 100644
--- a/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/trex/tasks/main.yaml
@@ -1,60 +1,24 @@
 ---
 # file: roles/trex/tasks/main.yaml
 
-- name: T-Rex Install - Install Distribution - Release - Machine Prerequisites
-  package:
-    name: "{{ packages | flatten(levels=1) }}"
-    state: latest
-    update_cache: true
-  tags:
-    - install-dependencies
-
-- name: T-Rex Install - Get Release Archive
-  get_url:
-    url: "https://github.com/cisco-system-traffic-generator/trex-core/archive/v{{ trex_version }}.tar.gz"
-    dest: "{{ trex_target_dir }}/trex-core-{{ trex_version }}.tar.gz"
-    mode: 0644
-  register: trex_downloaded
-  tags:
-    - install-trex
-
-- name: T-Rex Install - Ensure Directory Exists
-  file:
-    path: "{{ trex_target_dir }}/trex-core-{{ trex_version }}"
-    state: "directory"
-  register: trex_dir_created
-  tags:
-    - install-trex
-
-- name: T-Rex Install - Extract Release Archive
-  unarchive:
-    remote_src: true
-    src: "{{ trex_target_dir }}/trex-core-{{ trex_version }}.tar.gz"
-    dest: "{{ trex_target_dir }}/"
-    creates: "{{ trex_target_dir }}/trex-core-{{ trex_version }}/linux_dpdk/"
-  when: trex_dir_created
-  register: trex_extracted
-  tags:
-    - install-trex
-
-- name: T-Rex Install - Azure patch I
-  patch:
-    src: "files/t-rex.patch"
-    basedir: "{{ trex_target_dir }}/trex-core-{{ trex_version }}"
-    strip: 1
+- name: Inst - Update Package Cache (APT)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
   when:
-    - azure is defined
+    - ansible_distribution|lower == 'ubuntu'
   tags:
-    - install-trex
+    - trex-inst-prerequisites
 
-- name: T-Rex Install - Compile Release I
-  raw: "cd {{ trex_target_dir }}/trex-core-{{ trex_version }}/linux_dpdk/; ./b configure; ./b build"
-  when: trex_extracted
+- name: Inst - Prerequisites
+  package:
+    name: "{{ packages | flatten(levels=1) }}"
+    state: latest
   tags:
-    - install-trex
+    - trex-inst-prerequisites
 
-- name: T-Rex Install - Compile Release II
-  raw: "cd {{ trex_target_dir }}/trex-core-{{ trex_version }}/scripts/ko/src; make; make install"
-  when: trex_extracted
+- name: Inst - Multiple T-Rex Versions
+  include_tasks: deploy_block.yaml
+  loop: "{{ trex_version }}"
   tags:
-    - install-trex
+    - trex-inst
\ No newline at end of file