diff options
| author |   Ryota Mibu <r-mibu@cq.jp.nec.com> | 2017-01-30 02:10:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-30 02:10:52 +0000 |
| commit | 4f1c46c22779e019b6b2eecf5886881b5c8833d9 (patch) | |
| tree | 6ab2e5b90a0db80b31deeeff91c963276eaa69b1 | |
| parent | fab20481e7abc89ea512b99b6a8d078d126acd97 (diff) | |
| parent | b67046c7b27e75a20e21cb452b8a897a0b759bed (diff) | |
Merge "remove DEPLOY_SCENARIO from installer-params"
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 4 | ||||
| -rw-r--r-- | 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 @@ -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' |