diff options
Diffstat (limited to 'resources')
-rw-r--r-- | resources/ansible_roles/inxi/tasks/main.yml | 2 | ||||
-rw-r--r-- | resources/ansible_roles/nDPI/tasks/main.yml | 2 | ||||
-rw-r--r-- | resources/ansible_roles/openssl/tasks/main.yml | 2 | ||||
-rw-r--r-- | resources/ansible_roles/qtip-workspace/files/defaults/run.yml | 12 | ||||
-rw-r--r-- | resources/ansible_roles/ramspeed/tasks/main.yml | 2 | ||||
-rw-r--r-- | resources/ansible_roles/unixbench/tasks/main.yml | 4 |
6 files changed, 17 insertions, 7 deletions
diff --git a/resources/ansible_roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml index 66c83f9d..0267b680 100644 --- a/resources/ansible_roles/inxi/tasks/main.yml +++ b/resources/ansible_roles/inxi/tasks/main.yml @@ -46,6 +46,6 @@ - name: create system information report template: src: system-info.j2 - dest: "{{ qtip_results }}/{{ inventory_hostname }}/system-info" + dest: "{{ qtip_results }}/system-info" delegate_to: localhost tags: [report] diff --git a/resources/ansible_roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml index c53a22fc..d8bee591 100644 --- a/resources/ansible_roles/nDPI/tasks/main.yml +++ b/resources/ansible_roles/nDPI/tasks/main.yml @@ -62,6 +62,6 @@ - name: create dpi report template: src: dpi-metrics.j2 - dest: "{{ qtip_results }}/{{ inventory_hostname }}/dpi-metrics" + dest: "{{ qtip_results }}/dpi-metrics" delegate_to: localhost tags: [report] diff --git a/resources/ansible_roles/openssl/tasks/main.yml b/resources/ansible_roles/openssl/tasks/main.yml index 7975c177..864d0946 100644 --- a/resources/ansible_roles/openssl/tasks/main.yml +++ b/resources/ansible_roles/openssl/tasks/main.yml @@ -60,6 +60,6 @@ - name: create SSL report template: src: ssl-metrics.j2 - dest: "{{ qtip_results }}/{{ inventory_hostname }}/ssl-metrics" + dest: "{{ qtip_results }}/ssl-metrics" delegate_to: localhost tags: [report] diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml index d0f452aa..31969281 100644 --- a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml +++ b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml @@ -13,6 +13,12 @@ # - test condition # - performance metrics +- hosts: localhost + tasks: + - name: setting result directory name + set_fact: + qtip_results_base: "{{ qtip_results }}/{{ pod_name }}-{{ lookup('pipe', 'date +%Y%m%d-%H%M') }}" + - hosts: compute pre_tasks: @@ -20,9 +26,13 @@ - name: check ssh connection ping: + - name: overriding result directory name + set_fact: + qtip_results: "{{ hostvars['localhost']['qtip_results_base']}}/{{ inventory_hostname }}" + - name: create result directory file: - path: "{{ qtip_results }}/{{ inventory_hostname }}" + path: "{{ qtip_results }}" state: directory delegate_to: localhost diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml index 73df35de..2616cccc 100644 --- a/resources/ansible_roles/ramspeed/tasks/main.yml +++ b/resources/ansible_roles/ramspeed/tasks/main.yml @@ -70,6 +70,6 @@ - name: create memory metrics report template: src: "memory-metrics.j2" - dest: "{{ qtip_results }}/{{ inventory_hostname }}/memory-metrics" + dest: "{{ qtip_results }}/memory-metrics" delegate_to: localhost tags: [report] diff --git a/resources/ansible_roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml index 4c01609a..cce42fa1 100644 --- a/resources/ansible_roles/unixbench/tasks/main.yml +++ b/resources/ansible_roles/unixbench/tasks/main.yml @@ -32,13 +32,13 @@ synchronize: mode: pull src: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench/results/" - dest: "{{ qtip_results }}/{{ inventory_hostname }}/unixbench" + dest: "{{ qtip_results }}/unixbench" use_ssh_args: yes - name: create integer and floating point report template: src: "{{ item }}.j2" - dest: "{{ qtip_results }}/{{ inventory_hostname }}/{{ item }}" + dest: "{{ qtip_results }}/{{ item }}" with_items: - floating-point - integer |