remove DEPLOY_SCENARIO from installer-params

Change-Id: Iea26041bacb8c8447519634b8f37d1b59b8f27e8
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 0e479cc..a57bf17 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -178,6 +178,10 @@
             branch: '{branch}'
         - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-bgpvpn-noha'
+            description: 'Scenario to deploy and test'
 
     builders:
         - description-setter:

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 8e957eb..6e965a9 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -9,10 +9,6 @@
             name: INSTALLER_TYPE
             default: apex
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'external'
@@ -115,10 +111,6 @@
             name: INSTALLER_TYPE
             default: netvirt
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-bgpvpn-noha'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'external'