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 "Update docker build for EL7"
[releng/builder.git]
/
jjb
/
discovery
/
discovery.yaml
diff --git
a/jjb/discovery/discovery.yaml
b/jjb/discovery/discovery.yaml
index 36f1170d557cc1f717cfe1c20e13300d9c34d434..5670ebe468648fece9ecedccb9cac1b19dacd8ad 100644
(file)
--- a/
jjb/discovery/discovery.yaml
+++ b/
jjb/discovery/discovery.yaml
@@
-15,10
+15,10
@@
- 'discovery-clm-{stream}'
- 'discovery-clm-{stream}'
- # 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
)
stream:
stream:
- -
master
:
+ -
beryllium
:
branch: 'master'
jdk: openjdk7
jdks:
branch: 'master'
jdk: openjdk7
jdks:
@@
-27,7
+27,8
@@
project: 'discovery'
# For the Job templates below replace instances of:
project: 'discovery'
# For the Job templates below replace instances of:
-# PROJECT with your project name (eg. controller)
+# PROJECT_SHORTNAME with your project name (eg. circuitsw)
+# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
# MAVEN_GOALS with your maven goals to build
# MAVEN_OPTS with your maven options to build
# MAVEN_GOALS with your maven goals to build
# MAVEN_OPTS with your maven options to build
@@
-39,8
+40,8
@@
# The purpose of this job template is to setup a ODL verify job
#
# Required Variables:
# 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
@@
-87,15
+88,18
@@
builders:
- wipe-org-opendaylight-repo
builders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
- maven-target:
- maven-target:
- maven-version: '{mvn3
2
}'
+ maven-version: '{mvn3
3
}'
pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
java-opts:
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
- - jacoco-nojava-workaround
publishers:
- findbugs
publishers:
- findbugs
@@
-112,8
+116,8
@@
# and deploy artifacts to Nexus.
#
# Required Variables:
# and deploy artifacts to Nexus.
#
# 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
@@
-148,18
+152,19
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
root-pom: 'pom.xml'
- goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
source:jar javadoc:jar
-Dmerge'
+ goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
- postbuilders:
- - jacoco-nojava-workaround
-
reporters:
- findbugs
reporters:
- findbugs
@@
-181,8
+186,8
@@
# builder and pushes to Sonar analysis.
#
# Required Variables:
# builder and pushes to Sonar analysis.
#
# 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_verify
project-type: maven
node: dynamic_verify
@@
-215,18
+220,19
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
root-pom: 'pom.xml'
- goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
source:jar javadoc:jar
'
+ goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
- postbuilders:
- - jacoco-nojava-workaround
-
reporters:
- findbugs
reporters:
- findbugs
@@
-238,6
+244,10
@@
- job-template:
name: 'discovery-distribution-{stream}'
- job-template:
name: 'discovery-distribution-{stream}'
+ # Required variables:
+ # stream: release stream (eg. stable-lithium or beryllium)
+ # branch: git branch (eg. stable/lithium or master)
+
project-type: maven
node: dynamic_merge
jdk: '{jdk}'
project-type: maven
node: dynamic_merge
jdk: '{jdk}'
@@
-271,11
+281,14
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
root-pom: 'pom.xml'
- goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install
source:jar javadoc:jar
'
+ goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: '{integration-settings}'
global-settings: '{odl-global-settings}'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
settings: '{integration-settings}'
global-settings: '{odl-global-settings}'
@@
-299,8
+312,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
@@
-335,18
+348,19
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
root-pom: 'pom.xml'
- goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
source:jar javadoc:jar
'
+ goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
- postbuilders:
- - jacoco-nojava-workaround
-
reporters:
- findbugs
reporters:
- findbugs
@@
-386,18
+400,24
@@
triggers:
- timed: 'H H * * *'
triggers:
- timed: 'H H * * *'
+ - gerrit-trigger-patch-sonar:
+ name: 'discovery'
+
+ prebuilders:
+ - wipe-org-opendaylight-repo
+ - jacoco-nojava-workaround
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
settings: '{discovery-settings}'
global-settings: '{odl-global-settings}'
- postbuilders:
- - jacoco-nojava-workaround
-
reporters:
- findbugs
reporters:
- findbugs
@@
-443,9
+463,12
@@
prebuilders:
- wipe-org-opendaylight-repo
prebuilders:
- wipe-org-opendaylight-repo
+ - provide-maven-settings:
+ global-settings-file: '{odl-global-settings}'
+ settings-file: '{yangtools-settings}'
maven:
maven:
- maven-name: '{mvn3
2
}'
+ maven-name: '{mvn3
3
}'
root-pom: 'pom.xml'
goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
root-pom: 'pom.xml'
goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'