Merge "VNFM with ETSI FEAT03 changes"

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

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 4551dc5..1b86a3a 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -58,7 +58,7 @@
           # in phase jobs
           echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-fault_management'
+          name: 'doctor-verify-fuel'
           execution-type: PARALLEL
           projects:
             - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
@@ -70,11 +70,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-maintenance'
-          execution-type: PARALLEL
-          projects:
-            - name: doctor-verify-maintenance-fuel-sample-x86_64-{stream}'
+            - name: 'doctor-verify-maintenance-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -102,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:
@@ -129,6 +126,7 @@
           scenario: '{scenario}'
           test_case: 'maintenance'
           admin_tool_type: 'fenix'
+          app_manager_type: 'vnfm'
     scm:
       - git-scm-gerrit
     builders:
@@ -154,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:
@@ -185,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
@@ -210,7 +212,7 @@
 
           # 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
 
 
 # -------------------------------