Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix spectrometer-merge job to only run on merges
[releng/builder.git]
/
jjb-templates
/
integration.yaml
diff --git
a/jjb-templates/integration.yaml
b/jjb-templates/integration.yaml
index d6ff863ea02cd1c7dc5fc670f0550194b98d1e66..97d1aa89e57d1048bf3393fbf9712e84d9844098 100644
(file)
--- a/
jjb-templates/integration.yaml
+++ b/
jjb-templates/integration.yaml
@@
-1,5
+1,5
@@
- job-template:
- job-template:
- name: 'PROJECT-integration-{stream}'
+ name: 'PROJECT
_SHORTNAME
-integration-{stream}'
disabled: DISABLED
# Job template for ODL integration verify jobs
disabled: DISABLED
# Job template for ODL integration verify jobs
@@
-46,13
+46,16
@@
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
prebuilders:
- wipe-org-opendaylight-repo
- jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{JENKINS_SETTINGS}'
maven:
maven-name: '{mvn33}'
root-pom: 'POM'
maven:
maven-name: '{mvn33}'
root-pom: 'POM'
- goals: 'MAVEN_GOALS'
+ goals: 'MAVEN_GOALS
-Djenkins
'
maven-opts: 'MAVEN_OPTS'
maven-opts: 'MAVEN_OPTS'
- settings: '{
PROJECT-settings
}'
+ settings: '{
JENKINS_SETTINGS
}'
global-settings: '{odl-global-settings}'
reporters:
global-settings: '{odl-global-settings}'
reporters: