[doctor] fix functest log file path

[releng.git] / jjb / doctor / doctor.yml

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 62f89e6..e8b814c 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -19,6 +19,13 @@
         - apex:
             slave-label: 'ool-virtual1'
             pod: 'ool-virtual1'
+        - 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'
 
     inspector:
         - 'sample'
@@ -34,7 +41,7 @@
 
     jobs:
         - 'doctor-verify-{stream}'
-        - 'doctor-{task}-{installer}-{inspector}-{stream}':
+        - 'doctor-{task}-{installer}-{inspector}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -92,10 +99,7 @@
             default: /home/jenkins/openstack.creds
             description: 'OpenStack credentials'
         - '{slave-label}-defaults'
-        - string:
-            name: INSTALLER_TYPE
-            default: '{installer}'
-            description: 'Installer used for deploying OPNFV on this POD'
+        - '{installer}-defaults'
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
@@ -145,7 +149,7 @@
     builders:
         - 'functest-suite-builder'
         - shell: |
-            functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
+            functest_log="$HOME/opnfv/functest/results/{project}.log"
             to_be_archived="$WORKSPACE/tests/functest-{project}.log"
             cp $functest_log $to_be_archived
             # NOTE: checking the test result, as the previous job could return