From 6144eac326d14e26bbb849abea51c4cf7f3881b6 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Thu, 20 Apr 2017 22:51:59 +0800
Subject: Group test results and report under node

Change-Id: I66286787d06c5012c6dcf516cffb9f6fd76522c5
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/roles/qtip-workspace/files/copy/run.yml  | 32 ++--------------------
 .../roles/qtip-workspace/files/copy/setup.yml      |  2 +-
 .../qtip-workspace/files/render/group_vars/all.yml |  2 +-
 3 files changed, 4 insertions(+), 32 deletions(-)

(limited to 'resources/roles/qtip-workspace')

diff --git a/resources/roles/qtip-workspace/files/copy/run.yml b/resources/roles/qtip-workspace/files/copy/run.yml
index ddac875c..ed87b6a4 100644
--- a/resources/roles/qtip-workspace/files/copy/run.yml
+++ b/resources/roles/qtip-workspace/files/copy/run.yml
@@ -22,13 +22,6 @@
   roles:
   - development-tools
 
-  post_tasks:
-  - name: create dumping directories
-    file:
-      path: "{{ qtip_dump }}/{{ inventory_hostname }}"
-      state: directory
-    delegate_to: localhost
-
   tags: [setup]
 
 
@@ -50,7 +43,7 @@
       spec:   "{{ qtip_resources }}/QPI/compute.yaml"
     register: qpi_result
     delegate_to: localhost
-    tags: [calculate]
+    tags: [qpi]
 
 
 - hosts: localhost
@@ -61,31 +54,10 @@
     aggregate:
       group: compute
     register: pod_result
+    tags: [pod]
 
   # Generate and publish report
 
-  - name: create report folder
-    file:
-      path: "{{ qtip_reports }}"
-      state: directory
-
-  - name: create system information report
-    template:
-      src: "{{ qtip_resources }}/template/system-info.j2"
-      dest: "{{ qtip_reports }}/system-info"
-
-  - name: create qpi report
-    template:
-      src: "{{ qtip_resources }}/template/qpi-report.j2"
-      dest: "{{ qtip_reports }}/qpi-report"
-    tags: [report]
-
-  - name: create dpi metrics report
-    template:
-      src: "{{ qtip_resources }}/template/dpi-metrics.j2"
-      dest: "{{ qtip_reports }}/dpi-metrics"
-    tags: [report, dpi]
-
   - name: push result to testapi
     uri:
       url: "{{ testapi_url }}/results"
diff --git a/resources/roles/qtip-workspace/files/copy/setup.yml b/resources/roles/qtip-workspace/files/copy/setup.yml
index 88cdb1d2..0923ba52 100644
--- a/resources/roles/qtip-workspace/files/copy/setup.yml
+++ b/resources/roles/qtip-workspace/files/copy/setup.yml
@@ -48,7 +48,7 @@
       state: directory
     with_items:
       - "{{ qtip_cache }}"
-      - "{{ qtip_reports }}"
+      - "{{ qtip_results }}"
 
 # Initialize testapi database
 - hosts: localhost
diff --git a/resources/roles/qtip-workspace/files/render/group_vars/all.yml b/resources/roles/qtip-workspace/files/render/group_vars/all.yml
index c00e72a4..af7f756b 100644
--- a/resources/roles/qtip-workspace/files/render/group_vars/all.yml
+++ b/resources/roles/qtip-workspace/files/render/group_vars/all.yml
@@ -8,7 +8,7 @@
 ##############################################################################
 
 qtip_resources: "{{ qtip_package }}/resources"
-qtip_reports: reports
+qtip_results: results
 qtip_fixtures: fixtures
 qtip_dump: dump
 qtip_cache: .cache
-- 
cgit 1.2.3-korg