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
Change distribution-check job to do verification in same job
[releng/builder.git]
/
jjb-templates
/
verify.yaml
diff --git
a/jjb-templates/verify.yaml
b/jjb-templates/verify.yaml
index e2bab37130066340da5effb69945f0569b3e8d76..00b0f21ac5a710e13d673c07799f0e25ca85e196 100644
(file)
--- a/
jjb-templates/verify.yaml
+++ b/
jjb-templates/verify.yaml
@@
-1,13
+1,13
@@
- job-template:
- job-template:
- name: 'PROJECT-verify-{stream}'
+ name: 'PROJECT
_SHORTNAME
-verify-{stream}'
# Job template for ODL verify jobs
#
# The purpose of this job template is to setup a ODL verify job
#
# Required Variables:
# Job template for ODL verify jobs
#
# The purpose of this job template is to setup a ODL verify job
#
# 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: matrix
node: matrix_master
project-type: matrix
node: matrix_master
@@
-21,8
+21,7
@@
- dynamic_verify
- axis:
type: jdk
- dynamic_verify
- axis:
type: jdk
- values:
-JDKS
+ values: '{obj:jdks}'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-35,6
+34,8
@@
JDKS
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: 'refs/heads/{branch}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-45,27
+46,31
@@
JDKS
wrappers:
- build-timeout
- ssh-agent-credentials:
wrappers:
- build-timeout
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ users:
+ - '{ssh-credentials}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
- name: 'PROJECT'
+ name: 'PROJECT
_PATH
'
branch: '{branch}'
builders:
- wipe-org-opendaylight-repo
branch: '{branch}'
builders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{JENKINS_SETTINGS}'
- maven-target:
- maven-target:
- maven-version: '{mvn3
2
}'
+ maven-version: '{mvn3
3
}'
pom: 'POM'
pom: 'POM'
- goals: 'MAVEN_GOALS'
+ goals: 'MAVEN_GOALS
-Djenkins -Dstream={stream}
'
java-opts:
- 'MAVEN_OPTS'
java-opts:
- 'MAVEN_OPTS'
- settings: '{
PROJECT-settings
}'
+ settings: '{
JENKINS_SETTINGS
}'
global-settings: '{odl-global-settings}'
global-settings: '{odl-global-settings}'
- - jacoco-nojava-workaround
publishers:
- findbugs
- email-notification:
publishers:
- findbugs
- email-notification:
- email-prefix: '[PROJECT]'
+ email-prefix: '[PROJECT
_SHORTNAME
]'
- jacoco-report
- jacoco-report