X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftg%2Ftasks%2Fwrk.yaml;h=aee3761476edb450cc3bae6e89b6b307802b6e29;hp=1da45fb4b47221922be31267af62b890649768b4;hb=f4604e91598ef6f914b7ce1ab57f7d44dc043460;hpb=37a9451377f7239365b5af778b8072d1585a2d2a

diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/wrk.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/wrk.yaml
index 1da45fb4b4..aee3761476 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/wrk.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/wrk.yaml
@@ -1,33 +1,40 @@
 ---
 # file: roles/tg/tasks/wrk.yaml
 
-- name: Download WRK release archive
+- name: WRK Install - Get Release Archive
   get_url:
-    url: '{{ wrk.url }}/{{ wrk.version }}.tar.gz'
+    url: 'https://github.com/wg/wrk/archive/{{ wrk.version }}.tar.gz'
     dest: '{{ wrk.target_dir }}/{{ wrk.version }}.tar.gz'
     mode: 0644
-  register: 'linux__wrk_downloaded'
+  register: wrk_downloaded
   tags: install-wrk
 
-- name: Extract WRK release archive
-  become: yes
+- name: WRK Install - Ensure Directory Exists
+  file:
+    path: '{{ wrk.target_dir }}/wrk-{{ wrk.version }}'
+    state: 'directory'
+  register: wrk_dir_created
+  tags: install-wrk
+
+- name: WRK Install - Extract Release Archive
   unarchive:
+    remote_src: true
     src: '{{ wrk.target_dir }}/{{ wrk.version }}.tar.gz'
-    dest: '{{ wrk.target_dir }}/wrk-{{ wrk.version }}'
-    remote_src: yes
-  when: 'linux__wrk_downloaded'
-  register: 'linux__wrk_extracted'
+    dest: '{{ wrk.target_dir }}/'
+    creates: '{{ wrk.target_dir }}/wrk-{{ wrk.version }}/src'
+  when: wrk_dir_created
+  register: wrk_extracted
   tags: install-wrk
 
-- name: Compile WRK release
-  become: yes
-  shell: 'cd {{ wrk.target_dir }}/wrk-{{ wrk.version }}; make'
-  when: 'linux__wrk_extracted'
-  register: 'linux__wrk_compiled'
+- name: WRK Install - Compile Release
+  command: 'make'
+  args:
+    chdir: '{{ wrk.target_dir }}/wrk-{{ wrk.version }}'
+  when: wrk_extracted
+  register: wrk_compiled
   tags: install-wrk
 
-- name: Move WRK binary
-  become: yes
+- name: WRK Install - Move Binary
   command: 'mv {{ wrk.target_dir }}/wrk-{{ wrk.version }}/wrk /usr/local/bin/'
-  when: 'linux__wrk_compiled'
+  when: wrk_compiled
   tags: install-wrk