diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/opnfv-fuel.yml | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml index 92bd96b87..aec85bc9c 100644 --- a/jjb/fuel/opnfv-fuel.yml +++ b/jjb/fuel/opnfv-fuel.yml @@ -8,11 +8,16 @@ installer: 'fuel' controller: - - 'opencontrail' - - 'opendaylight' + - 'odl' - 'onos' + - 'opencontrail' - pod: 'lf-pod2' + pod: + - 'opnfv-jump-2' + - 'ericsson-pod1' + + loop: + - 'daily' stream: - master: @@ -20,24 +25,23 @@ gs-pathname: '' jobs: - - 'opnfv-fuel-{controller}-daily-{stream}' - - 'opnfv-fuel-daily-deploy-{stream}' + - 'opnfv-fuel-{controller}-{pod}-{loop}-{stream}' + - 'opnfv-fuel-deploy-{pod}-{loop}-{stream}' ######################## # job templates ######################## - job-template: - name: 'opnfv-fuel-{controller}-daily-{stream}' + name: 'opnfv-fuel-{controller}-{pod}-{loop}-{stream}' disabled: true concurrent: false - node: ericsson-build - parameters: - project-parameter: project: '{installer}' + - 'ericsson-ca-build-1-defaults' - '{installer}-defaults': controller: '{controller}' @@ -53,10 +57,10 @@ git-revision: true block: true predefined-parameters: - CONTROLLER='{controller}' + CONTROLLER={controller} - job-template: - name: 'opnfv-fuel-daily-deploy-{stream}' + name: 'opnfv-fuel-deploy-{pod}-{loop}-{stream}' disabled: true @@ -69,7 +73,8 @@ parameters: - project-parameter: project: '{installer}' - - '{pod}-defaults' + - '{pod}-defaults': + loop: '{loop}' - '{installer}-defaults' scm: |