summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-10 17:00:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-10 17:00:17 +0000
commit99c121c4a1b8602e21643d38d4aa28cf4ee4c83a (patch)
treeea21818621eff747cdd1ed88d11a1cf30b65f7d9 /jjb/fuel
parent7a1c0226296b4c128590ce8d8d86b0e1d4d8be97 (diff)
parent7defa8341a6b60067e3208d0e62da7a4b048a69f (diff)
Merge "Shorten and remove the word deploy from pod names"
Diffstat (limited to 'jjb/fuel')
-rw-r--r--jjb/fuel/opnfv-fuel.yml21
1 files changed, 13 insertions, 8 deletions
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index 4070f46cf..aec85bc9c 100644
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -12,7 +12,12 @@
- 'onos'
- 'opencontrail'
- pod: 'opnfv-jump-2'
+ pod:
+ - 'opnfv-jump-2'
+ - 'ericsson-pod1'
+
+ loop:
+ - 'daily'
stream:
- master:
@@ -20,24 +25,23 @@
gs-pathname: ''
jobs:
- - 'opnfv-fuel-{controller}-{pod}-daily-{stream}'
- - 'opnfv-fuel-deploy-{pod}-daily-{stream}'
+ - 'opnfv-fuel-{controller}-{pod}-{loop}-{stream}'
+ - 'opnfv-fuel-deploy-{pod}-{loop}-{stream}'
########################
# job templates
########################
- job-template:
- name: 'opnfv-fuel-{controller}-{pod}-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}'
@@ -56,7 +60,7 @@
CONTROLLER={controller}
- job-template:
- name: 'opnfv-fuel-deploy-{pod}-daily-{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: