cleanup using string templates
@@ -26,8 +26,12 @@ node("master") {
stage('Run tests on Java8') {
lock("label": "memory", "quantity": 6) {
- docker.image("${mvnJdk8Image}").inside("--label collectd_docker_app=${appNameLabel} --label collectd_docker_task=${taskLabel} "
- + "--name ${containerName} --memory=6g ${env.VOLUMES} --cap-add=SYS_PTRACE") {
+ docker.image("${mvnJdk8Image}")
+ .inside("""--label collectd_docker_app=${appNameLabel}
+ --label collectd_docker_task=${taskLabel}
+ --name ${containerName}
+ --memory=6g ${env.VOLUMES}
+ --cap-add=SYS_PTRACE""") {
try {
//skip integration test for now
sh "${mvnHome}/bin/mvn -V -fae clean install -Dsurefire.useFile=false -DskipITs"
@@ -45,8 +49,10 @@ node("master") {
stage('Run QA/Integration tests on Java8') {
lock("label": "memory", "quantity": 5) {
- docker.image("${mvnJdk8Image}").inside("--label collectd_docker_app=${appNameLabel} --label collectd_docker_task=${taskLabel} " +
- "--name ${containerName} --memory=5g ${env.VOLUMES}") {
+ docker.image("${mvnJdk8Image}").inside("""--label collectd_docker_app=${appNameLabel}
+ --label collectd_docker_task=${taskLabel}
+ --name ${containerName}
+ --memory=5g ${env.VOLUMES}""") {
try {
sh "${mvnHome}/bin/mvn -f distribution/pom.xml clean install -Pqa"
} finally {
@@ -59,8 +65,10 @@ node("master") {
stage('Publish Javadoc') {
lock("label": "memory", "quantity": 2) {
- docker.image("${mvnJdk8Image}").inside("--label collectd_docker_app=${appNameLabel} --label collectd_docker_task=${taskLabel} " +
- "--name ${containerName} --memory=2g ${env.VOLUMES}") {
+ docker.image("${mvnJdk8Image}").inside("""--label collectd_docker_app=${appNameLabel}
+ --label collectd_docker_task=${taskLabel}
+ --name ${containerName}
+ --memory=2g ${env.VOLUMES}""") {
sh "${mvnHome}/bin/mvn javadoc:aggregate"
sh "rsync -ra --stats ${WORKSPACE}/target/site/apidocs/ -e ${env.RSYNC_JAVADOC}/${env.BRANCH_NAME}/"
}
