From 341502cec1d70b6e9c09c27b8dae9e5e2f141328 Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Mon, 14 Jul 2014 11:30:46 +0300
Subject: [PATCH] Fix rally result publishing

User stack have no write permissions in $WORKSPACE, so subunit2html
should be done by jenkins. Also trick with writing to /tmp/results.html
does not work because publishing files from /tmp is not allowed.

Change-Id: Id35174932d9855f3d05023bc833f9b1053f27515
---
 .../jenkins_job_builder/config/rally.yaml     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
index 96d727ec3c..25bd87426c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml
@@ -23,16 +23,6 @@
               copy-after-failure: true
 
 
-- publisher:
-    name: rally-subunit
-    publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH/results.html.gz'
-              source: '/tmp/rally_testr_results.html.gz'
-
-
 - builder:
     name: devstack-rally-gate
     builders:
@@ -127,6 +117,8 @@
           function post_test_hook {
               cd $BASE/new/rally
               sudo -H -u stack tox -ecli -v
+              .tox/cli/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py .testrepository/subunit.log $WORKSPACE/results.html
+              gzip -9 $WORKSPACE/results.html
           }
           export -f pre_test_hook
           export -f post_test_hook
@@ -136,7 +128,12 @@
     publishers:
       - devstack-logs
       - console-log
-      - rally-subunit
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'results.html.gz'
+
 
 
 - job-group: