no need of jacoco for other jdk btw jenkins ui do not display jdk label.. (#2673)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
parent
f7df6b3326
commit
9e8743788d
|
@ -1,5 +1,6 @@
|
||||||
#!groovy
|
#!groovy
|
||||||
|
|
||||||
|
// in case of change update method isMainBuild
|
||||||
def jdks = ["jdk8","jdk9","jdk10","jdk11"]
|
def jdks = ["jdk8","jdk9","jdk10","jdk11"]
|
||||||
def oss = ["linux"]
|
def oss = ["linux"]
|
||||||
def builds = [:]
|
def builds = [:]
|
||||||
|
@ -101,31 +102,37 @@ def getFullBuild(jdk, os) {
|
||||||
// withMaven doesn't label..
|
// withMaven doesn't label..
|
||||||
// Report failures in the jenkins UI
|
// Report failures in the jenkins UI
|
||||||
junit testResults:'**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
|
junit testResults:'**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
|
||||||
// Collect up the jacoco execution results
|
consoleParsers = [[parserName: 'JavaDoc'],
|
||||||
def jacocoExcludes =
|
[parserName: 'JavaC']];
|
||||||
// build tools
|
if (isMainBuild( jdk )) {
|
||||||
"**/org/eclipse/jetty/ant/**" + ",**/org/eclipse/jetty/maven/**" +
|
// Collect up the jacoco execution results
|
||||||
",**/org/eclipse/jetty/jspc/**" +
|
def jacocoExcludes =
|
||||||
// example code / documentation
|
// build tools
|
||||||
",**/org/eclipse/jetty/embedded/**" + ",**/org/eclipse/jetty/asyncrest/**" +
|
"**/org/eclipse/jetty/ant/**" + ",**/org/eclipse/jetty/maven/**" +
|
||||||
",**/org/eclipse/jetty/demo/**" +
|
",**/org/eclipse/jetty/jspc/**" +
|
||||||
// special environments / late integrations
|
// example code / documentation
|
||||||
",**/org/eclipse/jetty/gcloud/**" + ",**/org/eclipse/jetty/infinispan/**" +
|
",**/org/eclipse/jetty/embedded/**" + ",**/org/eclipse/jetty/asyncrest/**" +
|
||||||
",**/org/eclipse/jetty/osgi/**" + ",**/org/eclipse/jetty/spring/**" +
|
",**/org/eclipse/jetty/demo/**" +
|
||||||
",**/org/eclipse/jetty/http/spi/**" +
|
// special environments / late integrations
|
||||||
// test classes
|
",**/org/eclipse/jetty/gcloud/**" + ",**/org/eclipse/jetty/infinispan/**" +
|
||||||
",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**";
|
",**/org/eclipse/jetty/osgi/**" + ",**/org/eclipse/jetty/spring/**" +
|
||||||
step( [$class : 'JacocoPublisher',
|
",**/org/eclipse/jetty/http/spi/**" +
|
||||||
inclusionPattern: '**/org/eclipse/jetty/**/*.class',
|
// test classes
|
||||||
exclusionPattern: jacocoExcludes,
|
",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**";
|
||||||
execPattern : '**/target/jacoco.exec',
|
step( [$class : 'JacocoPublisher',
|
||||||
classPattern : '**/target/classes',
|
inclusionPattern: '**/org/eclipse/jetty/**/*.class',
|
||||||
sourcePattern : '**/src/main/java'] )
|
exclusionPattern: jacocoExcludes,
|
||||||
|
execPattern : '**/target/jacoco.exec',
|
||||||
|
classPattern : '**/target/classes',
|
||||||
|
sourcePattern : '**/src/main/java'] )
|
||||||
|
consoleParsers = [[parserName: 'Maven'],
|
||||||
|
[parserName: 'JavaDoc'],
|
||||||
|
[parserName: 'JavaC']];
|
||||||
|
}
|
||||||
|
|
||||||
// Report on Maven and Javadoc warnings
|
// Report on Maven and Javadoc warnings
|
||||||
step( [$class : 'WarningsPublisher',
|
step( [$class : 'WarningsPublisher',
|
||||||
consoleParsers: [[parserName: 'Maven'],
|
consoleParsers: consoleParsers] )
|
||||||
[parserName: 'JavaDoc'],
|
|
||||||
[parserName: 'JavaC']]] )
|
|
||||||
}
|
}
|
||||||
if(isUnstable())
|
if(isUnstable())
|
||||||
{
|
{
|
||||||
|
@ -161,6 +168,10 @@ def getFullBuild(jdk, os) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def isMainBuild(jdk) {
|
||||||
|
return jdk == "jdk8"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// True if this build is part of the "active" branches
|
// True if this build is part of the "active" branches
|
||||||
// for Jetty.
|
// for Jetty.
|
||||||
|
|
Loading…
Reference in New Issue