Merge "Run Doctor fault management and maintenance in baremetal"

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

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index b78bab1..5b4c4b0 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -3,13 +3,19 @@
     name: doctor
 
     project: '{name}'
+    project-name: '{name}'
+    project-pattern: '{project}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser: &fraser
+      - gambia: &gambia
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -88,7 +94,11 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
+      - multijob:
+          name: 'doctor-verify-congress'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -98,10 +108,10 @@
               kill-phase-on: FAILURE
               git-revision: true
       - multijob:
-          name: 'doctor-verify-congress'
+          name: 'doctor-verify-sample-all'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
+            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -110,10 +120,6 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-sample-all'
-          execution-type: PARALLEL
-          # This would be for running all test cases with sample inspector
       - multijob:
           name: 'doctor-verify-congress-all'
           execution-type: PARALLEL