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 "Remove AD-SAL test from Beryllium (master) test"
[releng/builder.git]
/
jjb-templates
/
distribution.yaml
diff --git
a/jjb-templates/distribution.yaml
b/jjb-templates/distribution.yaml
index fb2ed0517eb34ac92ff565d9ee9e9381b3cee574..0d58aaf1e9ac88cd47c0c284955e76130f644a38 100644
(file)
--- a/
jjb-templates/distribution.yaml
+++ b/
jjb-templates/distribution.yaml
@@
-1,5
+1,5
@@
- job-template:
- job-template:
- name: 'PROJECT-distribution-{stream}'
+ name: 'PROJECT
_SHORTNAME
-distribution-{stream}'
# Required variables:
# stream: release stream (eg. stable-lithium or beryllium)
# Required variables:
# stream: release stream (eg. stable-lithium or beryllium)
@@
-17,7
+17,7
@@
parameters:
- project-parameter:
parameters:
- project-parameter:
- project: 'integration'
+ project: 'integration
/distribution
'
scm:
- git-scm:
scm:
- git-scm:
@@
-38,6
+38,9
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{JENKINS_SETTINGS}'
maven:
maven-name: '{mvn33}'
maven:
maven-name: '{mvn33}'