1 files changed, 26 insertions, 13 deletions

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index ba76b8abb..8c04ffd53 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -19,7 +19,7 @@
     installer:
       - 'apex'
       - 'fuel'
-    # - 'joid'
+      - 'daisy'
 
     arch:
       - 'x86_64'
@@ -29,19 +29,17 @@
       - 'sample'
       - 'congress'
 
-    task:
-      - verify:
-          auto-trigger-name: 'doctor-verify'
-
     exclude:
       - installer: 'apex'
         arch: 'aarch64'
+      - installer: 'daisy'
+        arch: 'aarch64'
 
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-unit-test-{stream}'
-      - 'doctor-{task}-{inspector}-{stream}'
-      - 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}'
+      - 'doctor-verify-{inspector}-{stream}'
+      - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -76,6 +74,7 @@
               file-paths:
                 - compare-type: ANT
                   pattern: 'doctor_tests/**'
+
     builders:
       - shell: |
          #!/bin/bash
@@ -117,16 +116,17 @@
       - 'doctor-verify-unit-test-publishers-macro'
 
 - job-template:
-    name: 'doctor-{task}-{inspector}-{stream}'
+    name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
     project-type: 'multijob'
     scm:
       - git-scm-gerrit
     triggers:
-      - '{auto-trigger-name}':
+      - 'doctor-verify':
           project: '{project}'
           branch: '{branch}'
           files: 'doctor_tests/**'
+
     builders:
       - shell: |
          #!/bin/bash
@@ -137,7 +137,7 @@
           name: 'doctor-verify-apex-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-apex-{inspector}-x86_64-{stream}'
+            - name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -151,7 +151,7 @@
           name: 'doctor-verify-fuel-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-fuel-{inspector}-x86_64-{stream}'
+            - name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -165,7 +165,20 @@
           name: 'doctor-verify-fuel-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-fuel-{inspector}-aarch64-{stream}'
+            - name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              kill-phase-on: FAILURE
+              current-parameters: true
+              git-revision: true
+      - multijob:
+          name: 'doctor-verify-daisy-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -177,7 +190,7 @@
               git-revision: true
 
 - job-template:
-    name: 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}'
+    name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
     node: 'doctor-{installer}-{arch}'
     wrappers: