Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2019-03-21 21:41:47 +10:00
parent e01eefe40e 27d9999125
commit 2fddd25f03
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Jmh_Jenkinsfile
View File

@ -2,11 +2,13 @@
def branch = params.get("JETTY_BRANCH" ,"jetty-10.0.x") def branch = params.get("JETTY_BRANCH" ,"jetty-10.0.x")
def owner = params.get("REPO_OWNER", "eclipse") def owner = params.get("REPO_OWNER", "eclipse")
def jdk = params.get("JDK", "jdk11")
def jmhJarPath = params.get("jmhJarPath","jetty-jmh/target/benchmarks.jar")
node("linux") { node("linux") {
// System Dependent Locations // System Dependent Locations
def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation' def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation'
def jdktool = tool name: "jdk8", type: 'hudson.model.JDK' def jdktool = tool name: "$jdk", type: 'hudson.model.JDK'
def mvnName = 'maven3.5' def mvnName = 'maven3.5'
def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}"
def settingsName = 'oss-settings.xml' def settingsName = 'oss-settings.xml'
@ -19,24 +21,22 @@ node("linux") {
stage("Checkout") { stage("Checkout") {
git url: "https://github.com/$owner/jetty.project.git", branch: "$branch" git url: "https://github.com/$owner/jetty.project.git", branch: "$branch"
} }
stage("Compile") { stage("Compile") {
withEnv(mvnEnv) { timeout(time: 15, unit: 'MINUTES') {
timeout(time: 15, unit: 'MINUTES') { withMaven(
withMaven( maven: mvnName,
maven: mvnName, jdk: jdk,
jdk: "jdk11", publisherStrategy: 'EXPLICIT',
publisherStrategy: 'EXPLICIT', globalMavenSettingsConfig: settingsName,
globalMavenSettingsConfig: settingsName, mavenOpts: mavenOpts,
mavenOpts: mavenOpts, mavenLocalRepo: localRepo) {
mavenLocalRepo: localRepo) { sh "mvn -V -B clean install -DskipTests -T6 -e -pl :jetty-jmh -am"
sh "mvn -V -B clean install -DskipTests -T6 -e"
}
} }
stash name: 'perf-tests', includes: 'jetty-jmh/target/benchmarks.jar'
} }
stash name: 'perf-tests', includes: jmhJarPath
} }
} }
@ -44,11 +44,13 @@ node("linux") {
stage("jmh-run") { stage("jmh-run") {
node( 'jmh-build-node' ) { node( 'jmh-build-node' ) {
timeout( time: 120, unit: 'MINUTES' ) { timeout( time: 180, unit: 'MINUTES' ) {
withEnv( ["JAVA_HOME=${tool "jdk8"}"] ) { withEnv( ["JAVA_HOME=${tool "$jdk"}"] ) {
unstash name: 'perf-tests' unstash name: 'perf-tests'
sh "${env.JAVA_HOME}/bin/java -jar jetty-jmh/target/benchmarks.jar -rff jetty-jmh/target/jmh_result.json -rf json" sh "rm -rf jmh_results"
jmhReport 'jetty-jmh/target/jmh_result.json' sh "mkdir jmh_results"
sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json"
jmhReport 'jmh_results/jmh_result.json'
} }
} }
} }