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 "Add stable/lithium jobs for openflowplugin"
[releng/builder.git]
/
jjb
/
didm
/
didm.yaml
diff --git
a/jjb/didm/didm.yaml
b/jjb/didm/didm.yaml
index d5952ff396c9c32b051f1518ffb4e1bc9288fa71..3fe1b58d82977b48d869cee5dcc7badcfb41c974 100644
(file)
--- a/
jjb/didm/didm.yaml
+++ b/
jjb/didm/didm.yaml
@@
-19,9
+19,11
@@
stream:
- master:
branch: 'master'
stream:
- master:
branch: 'master'
+ jdk: openjdk7
+ jdks:
+ - openjdk7
project: 'didm'
project: 'didm'
- jdk: 'openjdk7'
# For the Job templates below replace instances of:
# PROJECT with your project name (eg. controller)
# For the Job templates below replace instances of:
# PROJECT with your project name (eg. controller)
@@
-51,9
+53,7
@@
- dynamic_verify
- axis:
type: jdk
- dynamic_verify
- axis:
type: jdk
- values:
- - openjdk7
-
+ values: '{obj:jdks}'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-239,10
+239,11
@@
name: 'didm-integration-{stream}'
disabled: false
name: 'didm-integration-{stream}'
disabled: false
- # 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:
# stream: branch with - in place of / (eg. stable-helium)
#
# Required Variables:
# stream: branch with - in place of / (eg. stable-helium)
@@
-306,7
+307,7
@@
project-type: maven
node: dynamic_verify
project-type: maven
node: dynamic_verify
- jdk: '
{jdk}
'
+ jdk: '
openjdk7
'
logrotate:
daysToKeep: '7'
logrotate:
daysToKeep: '7'
@@
-360,7
+361,7
@@
project-type: maven
node: dynamic_verify
project-type: maven
node: dynamic_verify
- jdk: '
{jdk}
'
+ jdk: '
openjdk7
'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'