1 files changed, 39 insertions, 11 deletions

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e28f74431..e0de9aa2e 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -27,9 +27,9 @@
 
     phase:
       - 'build-x86_64':
-          slave-label: 'opnfv-build-ubuntu'
+          slave-label: 'doctor-{installer}-verify'
       - 'build-aarch64':
-          slave-label: 'opnfv-build-ubuntu-arm'
+          slave-label: 'doctor-{installer}-{phase}-verify'
 
     inspector:
       - 'sample'
@@ -50,7 +50,7 @@
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-unit-test-{stream}'
-      - 'doctor-{task}-{installer}-{inspector}-{stream}'
+      - 'doctor-{task}-{inspector}-{stream}'
       - 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
 
 - job-template:
@@ -135,24 +135,21 @@
 
 
 - job-template:
-    name: 'doctor-{task}-{installer}-{inspector}-{stream}'
+    name: 'doctor-{task}-{inspector}-{stream}'
 
     disabled: '{obj:disabled}'
 
     project-type: 'multijob'
 
-    node: '{slave-label}'
-
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
       - string:
           name: OS_CREDS
           default: /home/jenkins/openstack.creds
           description: 'OpenStack credentials'
-      - '{slave-label}-defaults'
-      - '{installer}-defaults'
       - string:
           name: DOCKER_TAG
           default: '{docker-tag}'
@@ -214,17 +211,46 @@
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-installer-inspector'
+          name: 'doctor-verify-apex-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-{installer}-{inspector}-build-x86_64-{stream}'
+            - name: 'doctor-{task}-apex-{inspector}-build-x86_64-{stream}'
               current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               git-revision: true
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'doctor-{task}-{installer}-{inspector}-build-aarch64-{stream}'
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-fuel-{inspector}-build-x86_64-{stream}'
               current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-fuel-{inspector}-build-aarch64-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               git-revision: true
               node-parameters: false
               kill-phase-on: FAILURE
@@ -233,6 +259,7 @@
 - job-template:
     name: 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave-label}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -241,6 +268,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - '{installer}-defaults'
       - '{slave-label}-defaults'
     scm:
       - git-scm-gerrit