From: Delia Popescu <delia.popescu@enea.com>
Date: Thu, 16 Nov 2017 16:08:29 +0000 (+0200)
Subject: doctor: Fix AArch64 phase jobs not found
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f07b01d1adcac6bc18d71c43755b943ce8222b8c;p=releng.git

doctor: Fix AArch64 phase jobs not found

Change-Id: Iefb3a889302ecbf3b69529405543908880fad87f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
---

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e28f74431..c29a10d72 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -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,14 +135,12 @@
 
 
 - 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}'
@@ -151,8 +149,7 @@
           name: OS_CREDS
           default: /home/jenkins/openstack.creds
           description: 'OpenStack credentials'
-      - '{slave-label}-defaults'
-      - '{installer}-defaults'
+      - 'opnfv-build-ubuntu-defaults'
       - string:
           name: DOCKER_TAG
           default: '{docker-tag}'
@@ -214,16 +211,30 @@
          # 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}-apex-{inspector}-build-x86_64-{stream}'
+              current-parameters: false
+              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}-{installer}-{inspector}-build-x86_64-{stream}'
+            - name: 'doctor-{task}-fuel-{inspector}-build-x86_64-{stream}'
               current-parameters: false
               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-aarch64-{stream}'
               current-parameters: false
               git-revision: true
               node-parameters: false
@@ -233,6 +244,7 @@
 - job-template:
     name: 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave-label}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -241,6 +253,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - '{installer}-defaults'
       - '{slave-label}-defaults'
     scm:
       - git-scm-gerrit