summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-01-27 08:03:06 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2017-01-27 08:03:06 +0000
commitb67046c7b27e75a20e21cb452b8a897a0b759bed (patch)
tree7ad8a429f5dc6b681e24882a0603e1accb5de7ce
parentc0bab8938479ed5b30858c2583e8f0ef69b65aa8 (diff)
remove DEPLOY_SCENARIO from installer-params
Change-Id: Iea26041bacb8c8447519634b8f37d1b59b8f27e8 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yml4
-rw-r--r--jjb/global/installer-params.yml8
2 files changed, 4 insertions, 8 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 0e479cc08..a57bf176e 100644
--- 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 8e957ebd9..6e965a9cb 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -10,10 +10,6 @@
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'
description: 'external network for test'
@@ -116,10 +112,6 @@
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'
description: 'external network for test'