summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-06-17 12:25:21 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-06-17 17:35:51 +0200
commitef438d9e5f30d73d2ef1d8be1e83191c51b76c6d (patch)
tree1d4f5c72d752f776e84bb29dcaecfd5d27711e3a
parentdc0afc7340a87950c25c9948e0253d22b625e078 (diff)
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>
-rw-r--r--jjb/functest/functest.yml17
1 files 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