[doctor] enable joid jobs

This patch enables doctor joid jobs for verification.

This patch also makes sure there is no log files before starting tests.

Change-Id: Idee794490c4ce794f3e7b7621fffcd5edeed9c83
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 11b4ffb..2333fca 100644 (file)
--- 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 e644096..7e11d92 100644 (file)
--- 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: