X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftg%2Ftasks%2Fmain.yaml;h=8dd885f0f71f928800c562bb5756fda29ae0e7b5;hp=24f433f9b93e4be1e44600030f9238b071b86b11;hb=744f1b25218b2a72be351056ff68af5f6a899bca;hpb=89d1c95ef55a732f1d5dfbbb8a2117439ac05bd4

diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
index 24f433f9b9..8dd885f0f7 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
@@ -7,3 +7,34 @@
 - name: Install WRK
   include_tasks: 'wrk.yaml'
   tags: install-wrk
+<<<<<<< HEAD   (89d1c9 Report: Show TSH results)
+=======
+
+- name: Install TRex
+  include_tasks: 'trex.yaml'
+  tags: install-trex
+
+- name: Copy csit-initialize-docker-tg.sh
+  copy:
+   src: 'files/csit-initialize-docker-tg.sh'
+   dest: '/usr/local/bin/csit-initialize-docker-tg.sh'
+   owner: 'root'
+   group: 'root'
+   mode: '744'
+  when: docker_tg is defined
+  tags: docker-tg
+
+- name: Start csit-initialize-docker-tg.service
+  copy:
+   src: 'files/csit-initialize-docker-tg.service'
+   dest: '/etc/systemd/system/'
+   owner: 'root'
+   group: 'root'
+   mode: '644'
+  notify:
+    - 'Start csit-initialize-docker-tg.service'
+  when: docker_tg is defined
+  tags: docker-tg
+
+- meta: flush_handlers
+>>>>>>> CHANGE (96eaab Add: Use containers for shared TG)