summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-02-03 16:48:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-03 16:48:25 +0000
commit0fc8f21d3dac320135d08ce088dd389f81aec908 (patch)
tree14e1b9805cef74c0c8d10296fe59dc35fd997ba8 /jjb
parent3302a2a6d341b6e8df8a96a29e0543a4bc7fd057 (diff)
parent45464855ca8dce449d5a5d7990168fb025b3a35f (diff)
Merge "[doctor] enable joid jobs"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/doctor/doctor.yml8
-rw-r--r--jjb/global/releng-macros.yml6
2 files changed, 10 insertions, 4 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 11b4ffbc2..2333fca14 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -22,10 +22,9 @@
- fuel:
slave-label: 'ool-virtual2'
pod: 'ool-virtual2'
- # TODO(r-mibu): enable this once joid is ready
- #- joid:
- # slave-label: 'ool-virtual3'
- # pod: 'ool-virtual3'
+ - joid:
+ slave-label: 'ool-virtual3'
+ pod: 'ool-virtual3'
inspector:
- 'sample'
@@ -145,6 +144,7 @@
branch: '{branch}'
builders:
+ - 'clean-workspace-log'
- 'functest-suite-builder'
- shell: |
functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index e6440966a..7e11d92f6 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -423,6 +423,12 @@
sed -r -i '4,$s/^/ /g' lint.log
fi
+- builder:
+ name: clean-workspace-log
+ builders:
+ - shell: |
+ find $WORKSPACE -type f -print -name '*.log' | xargs rm -f
+
- publisher:
name: archive-artifacts
publishers: