Organize common tasks under qtip-common role

Change-Id: I8592efdac7e6c2161eb7cb1b36d023697ebe7ad4
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

2 files changed, 16 insertions, 12 deletions

diff --git a/resources/ansible_roles/unixbench/meta/main.yml b/resources/ansible_roles/unixbench/meta/main.yml
new file mode 100644
index 00000000..333c512e
--- /dev/null
+++ b/resources/ansible_roles/unixbench/meta/main.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+
+allow_duplicates: yes
+dependencies:
+- { role: qtip-common, basename: unixbench }
diff --git a/resources/ansible_roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml
index e087bcb9..64e1021d 100644
--- a/resources/ansible_roles/unixbench/tasks/main.yml
+++ b/resources/ansible_roles/unixbench/tasks/main.yml
@@ -37,16 +37,6 @@
     chdir: "{{ workdir }}/byte-unixbench-5.1.3/UnixBench"
   register: unixbench_out
 
-- name: generating log filename
-  set_fact:
-    logfile: "{{ qtip_results }}/unixbench.log"
-
-- name: saving output to log
-  copy:
-    content: "{{ unixbench_out.stdout }}"
-    dest: "{{ logfile }}"
-  delegate_to: localhost
-
 - name: saving unixbench output to log
   copy:
     content: "{{ unixbench_out.stdout }}"
@@ -61,12 +51,12 @@
       # Double-Precision Whetstone                       55.0       3720.5    676.5
       - '^Dhrystone 2 using register variables\s+(\d+\.\d+)\s+(?P<dhrystone_lps>\d+\.\d+)\s+(\d+\.\d+)'
       - '^Double-Precision Whetstone\s+(\d+\.\d+)\s+(?P<whetstone_MWIPS>\d+\.\d+)\s+(\d+\.\d+)'
-    export_to: "{{ qtip_results }}/arithmetic_metrics.json"
+    dest: "{{ output }}/metrics.json"
   register: arithmetic_metrics
   delegate_to: localhost
 
 - name: creating arithmetic metrics report
   template:
     src: arithmetic-metrics.j2
-    dest: "{{ qtip_results }}/arithmetic-metrics"
+    dest: "{{ output }}/report"
   delegate_to: localhost