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
Merge "Make test-integration to rebase before build"
[releng/builder.git]
/
jjb-templates
/
verify.yaml
diff --git
a/jjb-templates/verify.yaml
b/jjb-templates/verify.yaml
index 33dc8886f68dd1087b3d95892f96255bb7aa6cd3..afe1078dac3cfd8900e966bcc4f9b86a6737ba23 100644
(file)
--- a/
jjb-templates/verify.yaml
+++ b/
jjb-templates/verify.yaml
@@
-34,6
+34,8
@@
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:
@@
-57,11
+59,11
@@
- jacoco-nojava-workaround
- provide-maven-settings:
global-settings-file: '{odl-global-settings}'
- jacoco-nojava-workaround
- provide-maven-settings:
global-settings-file: '{odl-global-settings}'
- settings-file: '{
yangtools-settings
}'
+ settings-file: '{
JENKINS_SETTINGS
}'
- maven-target:
maven-version: '{mvn33}'
pom: 'POM'
- maven-target:
maven-version: '{mvn33}'
pom: 'POM'
- goals: 'MAVEN_GOALS'
+ goals: 'MAVEN_GOALS
-Dstream={stream}
'
java-opts:
- 'MAVEN_OPTS'
settings: '{JENKINS_SETTINGS}'
java-opts:
- 'MAVEN_OPTS'
settings: '{JENKINS_SETTINGS}'