X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yaml;h=1b86a3a67b8f47c72f954f3bae191ee2339110ba;hb=e1f021c2d45e25e1ab13637f410d325f934bcd15;hp=ccdf6619319d2b33e51fa4dd07087cd32a458ac4;hpb=52fe2bfcad5ce039fc8e512343d12a085a074e1f;p=releng.git

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index ccdf66193..1b86a3a67 100644
--- 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-fuel'
           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
@@ -85,24 +70,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fenix'
-          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 +83,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:
@@ -130,7 +98,8 @@
           inspector: '{inspector}'
           scenario: '{scenario}'
           test_case: 'fault_management'
-          admin_tool_type: 'sample'
+          admin_tool_type: 'fenix'
+          app_manager_type: 'vnfm'
     scm:
       - git-scm-gerrit
     builders:
@@ -141,7 +110,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:
@@ -157,6 +126,7 @@
           scenario: '{scenario}'
           test_case: 'maintenance'
           admin_tool_type: 'fenix'
+          app_manager_type: 'vnfm'
     scm:
       - git-scm-gerrit
     builders:
@@ -182,7 +152,8 @@
           inspector: '{inspector}'
           scenario: '{scenario}'
           test_case: 'all'
-          admin_tool_type: 'sample'
+          admin_tool_type: 'fenix'
+          app_manager_type: 'vnfm'
     scm:
       - git-scm-gerrit
     builders:
@@ -213,7 +184,10 @@
           name: ADMIN_TOOL_TYPE
           default: '{admin_tool_type}'
           description: 'admin_tool_type: sample, fenix'
-
+      - string:
+          name: APP_MANAGER_TYPE
+          default: '{app_manager_type}'
+          description: 'app_manager_type: sample, vnfm'
 
 # -------------------------------
 # builder macros
@@ -227,16 +201,18 @@
           - ./doctor-env-presetup.sh
           - ../../utils/fetch_os_creds.sh
       - shell: |
+          #!/bin/bash
+
           # prepare the env for test
-          source $HOME/opnfv-openrc.sh
+          . $HOME/opnfv-openrc.sh
           if [ -f $HOME/os_cacert ]; then
               export OS_CACERT=$HOME/os_cacert
           fi
-          source $HOME/opnfv-installer.sh
+          . $HOME/opnfv-installer.sh
 
           # run tox to trigger the test
           # As Jenkins user, it has no permission to send ICMP package
-          sudo -E tox -e py34
+          sudo -E tox -e py36
 
 
 # -------------------------------