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 d3488c6abd59751979e6106606e345528d449625..97d1aa89e57d1048bf3393fbf9712e84d9844098 100644
(file)
--- a/
jjb-templates/integration.yaml
+++ b/
jjb-templates/integration.yaml
@@
-1,15
+1,16
@@
- job-template:
- job-template:
- name: 'PROJECT-integration-{stream}'
+ name: 'PROJECT
_SHORTNAME
-integration-{stream}'
disabled: DISABLED
disabled: DISABLED
- # Job template for ODL
merge
jobs
+ # Job template for ODL
integration verify
jobs
#
#
- # The purpose of this job template is to setup a ODL merge job
- # and deploy artifacts to Nexus.
+ # This is similar to a normal verify job, but it runs
+ # when a project that's a dependency of your project
+ # is successfully built.
#
# Required Variables:
#
# Required Variables:
- # stream:
branch with - in place of / (eg. stable-he
lium)
- # branch:
branch (eg. stable/helium
)
+ # stream:
release stream (eg. stable-lithium or beryl
lium)
+ # branch:
git branch (eg. stable/lithium or master
)
project-type: maven
node: dynamic_merge
project-type: maven
node: dynamic_merge
@@
-34,7
+35,8
@@
wrappers:
- build-timeout
- ssh-agent-credentials:
wrappers:
- build-timeout
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ users:
+ - '{ssh-credentials}'
triggers:
- reverse:
triggers:
- reverse:
@@
-43,18
+45,19
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{JENKINS_SETTINGS}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'POM'
root-pom: 'POM'
- goals: 'MAVEN_GOALS
source:jar javadoc:jar
'
+ goals: 'MAVEN_GOALS
-Djenkins
'
maven-opts: 'MAVEN_OPTS'
maven-opts: 'MAVEN_OPTS'
- settings: '{
PROJECT-settings
}'
+ settings: '{
JENKINS_SETTINGS
}'
global-settings: '{odl-global-settings}'
global-settings: '{odl-global-settings}'
- postbuilders:
- - jacoco-nojava-workaround
-
reporters:
- findbugs
reporters:
- findbugs