From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 5 Feb 2020 21:52:42 +0000 (+0000)
Subject: Merge "VNFM with ETSI FEAT03 changes"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7edc61bab16b8fd815517fcbbaee032669dcd97f;hp=eeded857149775094bcdaf50e0c64952b7891146;p=releng.git

Merge "VNFM with ETSI FEAT03 changes"
---

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 79d526274..1b86a3a67 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -98,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:
@@ -125,6 +126,7 @@
           scenario: '{scenario}'
           test_case: 'maintenance'
           admin_tool_type: 'fenix'
+          app_manager_type: 'vnfm'
     scm:
       - git-scm-gerrit
     builders:
@@ -150,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:
@@ -181,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