From b67046c7b27e75a20e21cb452b8a897a0b759bed Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Fri, 27 Jan 2017 08:03:06 +0000 Subject: remove DEPLOY_SCENARIO from installer-params Change-Id: Iea26041bacb8c8447519634b8f37d1b59b8f27e8 Signed-off-by: Ryota MIBU --- jjb/3rd_party_ci/odl-netvirt.yml | 4 ++++ jjb/global/installer-params.yml | 8 -------- 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 @@ -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' -- cgit 1.2.3-korg