From: Tomi Juvonen <tomi.juvonen@nokia.com>
Date: Tue, 28 Jan 2020 05:27:30 +0000 (+0200)
Subject: VNFM with ETSI FEAT03 changes
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bd4396965fa315b582ac733a1d7e54bb8b55dd7e;p=releng.git

VNFM with ETSI FEAT03 changes

Doctor to use ETSI FEAT03 constraints in maintenance testing

JIRA: DOCTOR-137

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

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