Doctor testing with fuel

Zte pod testing fault-management
Nokia pod testing maintenance with Fenix

Needed by: https://gerrit.opnfv.org/gerrit/c/doctor/+/68805

Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
Change-Id: I24f18a21ada73ae59d25b1f062320c98890b7cb4

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index c66624c..4551dc5 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -17,8 +17,6 @@
           disabled: false
 
     installer:
-      - 'apex':
-          scenario: 'os-nosdn-nofeature-noha'
       - 'fuel':
           scenario: 'os-nosdn-nofeature-noha'
 
@@ -30,10 +28,6 @@
       - 'sample'
       - 'congress'
 
-    exclude:
-      - installer: 'apex'
-        arch: 'aarch64'
-
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
@@ -64,18 +58,9 @@
           # in phase jobs
           echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-sample'
+          name: 'doctor-verify-fault_management'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                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
-              git-revision: true
             - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
@@ -86,23 +71,10 @@
               kill-phase-on: FAILURE
               git-revision: true
       - multijob:
-          name: 'doctor-verify-fenix'
+          name: 'doctor-verify-maintenance'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                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
-              git-revision: true
-      - multijob:
-          name: 'doctor-verify-congress'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
+            - name: doctor-verify-maintenance-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -115,7 +87,7 @@
 - job-template:
     name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'doctor-{installer}-{arch}'
+    node: 'zte-virtual4'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -141,7 +113,7 @@
 - job-template:
     name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'doctor-{installer}-{arch}'
+    node: 'nokia-pod1'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout: