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
Create a opendaylight-infra-wrapper macro
[releng/builder.git]
/
jjb-templates
/
integration.yaml
diff --git
a/jjb-templates/integration.yaml
b/jjb-templates/integration.yaml
index deed83ae9aed8dd519899a289c927eaa77b68095..5701c79ba120386cd37a96276eee707df28b8bf2 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
@@
-9,8
+9,8
@@
# is successfully built.
#
# Required Variables:
# is successfully built.
#
# 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
@@
-33,10
+33,8
@@
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - build-timeout
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - opendaylight-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- reverse:
triggers:
- reverse:
@@
-44,18
+42,20
@@
result: 'success'
prebuilders:
result: 'success'
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
-V -B -Djenkins
'
maven-opts: 'MAVEN_OPTS'
maven-opts: 'MAVEN_OPTS'
- settings: '{PROJECT-settings}'
- global-settings: '{odl-global-settings}'
-
- postbuilders:
- - jacoco-nojava-workaround
+ settings: 'JENKINS_SETTINGS'
+ settings-type: cfp
+ global-settings: 'odl-global-settings'
+ global-settings-type: cfp
reporters:
- findbugs
reporters:
- findbugs
@@
-64,3
+64,5
@@
- email-notification:
email-prefix: 'EMAIL_PREFIX'
- jacoco-report
- email-notification:
email-prefix: 'EMAIL_PREFIX'
- jacoco-report
+ - archive-build:
+ maven-version: '{mvn33}'