diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:37:40 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:55:48 +0000 |
| commit | e8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 (patch) | |
| tree | 0ae6865789e89d1dc8632b6d7b04f6a4697d0487 /jjb/opnfv | |
| parent | 324a87b519694309d141bbec8d15726d9cc1adb8 (diff) | |
Enable fuel nosdn scenario for master and stable/brahmaputra
This patch proposes below changes:
- Run CI on opnfv-jump-2 against stable/brahmaputra branch
- Run CI on ericsson-pod2 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until nosdn scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO
Change-Id: Ie3d4f946cd51271378b435f9a92af07aaf614c26
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 43edcc2ca..002ab7e52 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -331,19 +331,13 @@ - parameter: name: 'fuel-deploy-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-us-deploy-virtual-1 - - ericsson-ca-deploy-virtual-1 - default-slaves: - - intel-us-deploy-virtual-1 - - ericsson-ca-deploy-virtual-1 + - label: + name: SLAVE_LABEL + default: 'fuel-deploy-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' + description: 'Git URL to use on these Jenkins Slaves' - parameter: name: 'intel-us-deploy-virtual-2-defaults' |