DATAES-968 - Enable Maven caching for Jenkins jobs.

mp911de · mp911de · commit 8a20df24d2b6 · 2020-10-30T08:38:57.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,13 +25,12 @@ pipeline {
 						docker {
 							image 'adoptopenjdk/openjdk8:latest'
 							label 'data'
-							args '-v $HOME:/tmp/jenkins-home'
+							args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
 						}
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
-						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
 					}
 				}
 			}
@@ -47,7 +46,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
+					args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
 				}
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
@@ -57,8 +56,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'rm -rf ?'
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -76,7 +74,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
+					args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
 				}
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
@@ -86,7 +84,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,12 @@ pipeline {`
`25`	`25`	`docker {`
`26`	`26`	`image 'adoptopenjdk/openjdk8:latest'`
`27`	`27`	`label 'data'`
`28`		`- args '-v $HOME:/tmp/jenkins-home'`
	`28`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`options { timeout(time: 30, unit: 'MINUTES') }`
`32`	`32`	`steps {`
`33`		`- sh 'rm -rf ?'`
`34`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'`
	`33`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'`
`35`	`34`	`}`
`36`	`35`	`}`
`37`	`36`	`}`
`@@ -47,7 +46,7 @@ pipeline {`
`47`	`46`	`docker {`
`48`	`47`	`image 'adoptopenjdk/openjdk8:latest'`
`49`	`48`	`label 'data'`
`50`		`- args '-v $HOME:/tmp/jenkins-home'`
	`49`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -57,8 +56,7 @@ pipeline {`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`steps {`
`60`		`- sh 'rm -rf ?'`
`61`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`59`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +`
`62`	`60`	`'-Dartifactory.server=https://repo.spring.io ' +`
`63`	`61`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`64`	`62`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`@@ -76,7 +74,7 @@ pipeline {`
`76`	`74`	`docker {`
`77`	`75`	`image 'adoptopenjdk/openjdk8:latest'`
`78`	`76`	`label 'data'`
`79`		`- args '-v $HOME:/tmp/jenkins-home'`
	`77`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`80`	`78`	`}`
`81`	`79`	`}`
`82`	`80`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -86,7 +84,7 @@ pipeline {`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`steps {`
`89`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +`
	`87`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +`
`90`	`88`	`'-Dartifactory.server=https://repo.spring.io ' +`
`91`	`89`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`92`	`90`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`