From ef438d9e5f30d73d2ef1d8be1e83191c51b76c6d Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 17 Jun 2015 12:25:21 +0200
Subject: [PATCH] Move artifact storage and cleanup to their own macros

JIRA: FUNCTEST-9, FUNCTEST-12

Change-Id: Ibf1f959ca99a75bbbffd51ee36c9625b5f82cf57
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/functest/functest.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 9412bc2a0..1d4abb971 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -226,6 +226,8 @@
 
     builders:
         - 'functest-all'
+        - 'functest-store-results'
+        - 'functest-cleanup'
 
 - job-template:
     name: 'functest-daily-{stream}'
@@ -447,9 +449,20 @@
 
             # save tempest.conf for further troubleshooting
             cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results
-            
-            # push results to artifact
+
+- builder:
+    name: functest-store-results
+    builders:
+        - shell:
             !include-raw res-build.sh
 
+- builder:
+    name: functest-cleanup
+    builders:
+        - shell:
+        - shell: |
+            #!/bin/bash
+            set +e
+
             # cleanup
             python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean
-- 
2.16.6