DATAES-968 - Enable Maven caching for Jenkins jobs.

mp911de · mp911de · commit 1a354d8c514c · 2020-10-30T08:35:56.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,17 +23,14 @@ 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'
+					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 'mkdir -p /tmp/jenkins-home'
             	sh 'chown -R 1001:1001 .'
-				sh 'rm -rf ?'
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B'
-            	sh 'chown -R 1001:1001 .'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
 			}
 		}
 
@@ -50,17 +47,12 @@ pipeline {
 						docker {
 							image 'adoptopenjdk/openjdk11:latest'
 							label 'data'
-							args '-v $HOME:/tmp/jenkins-home'
-        					args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
+							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 'mkdir -p /tmp/jenkins-home'
-                        sh 'chown -R 1001:1001 .'
-						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'
-                        sh 'chown -R 1001:1001 .'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
 					}
 				}
 
@@ -69,17 +61,12 @@ pipeline {
 						docker {
 							image 'adoptopenjdk/openjdk15:latest'
 							label 'data'
-							args '-v $HOME:/tmp/jenkins-home'
-        					args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
+        					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 'mkdir -p /tmp/jenkins-home'
-                        sh 'chown -R 1001:1001 .'
-						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'
-                        sh 'chown -R 1001:1001 .'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
 					}
 				}
 			}
@@ -96,7 +83,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') }
@@ -106,8 +93,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} " +
@@ -125,7 +111,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') }
@@ -135,7 +121,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
`@@ -23,17 +23,14 @@ pipeline {`
`23`	`23`	`docker {`
`24`	`24`	`image 'adoptopenjdk/openjdk8:latest'`
`25`	`25`	`label 'data'`
`26`		`- args '-v $HOME:/tmp/jenkins-home'`
`27`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
	`26`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`options { timeout(time: 30, unit: 'MINUTES') }`
`31`	`30`	`steps {`
`32`	`31`	`sh 'mkdir -p /tmp/jenkins-home'`
`33`	`32`	`sh 'chown -R 1001:1001 .'`
`34`		`- sh 'rm -rf ?'`
`35`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B'`
`36`		`- sh 'chown -R 1001:1001 .'`
	`33`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'`
`37`	`34`	`}`
`38`	`35`	`}`
`39`	`36`
`@@ -50,17 +47,12 @@ pipeline {`
`50`	`47`	`docker {`
`51`	`48`	`image 'adoptopenjdk/openjdk11:latest'`
`52`	`49`	`label 'data'`
`53`		`- args '-v $HOME:/tmp/jenkins-home'`
`54`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
	`50`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`55`	`51`	`}`
`56`	`52`	`}`
`57`	`53`	`options { timeout(time: 30, unit: 'MINUTES') }`
`58`	`54`	`steps {`
`59`		`- sh 'mkdir -p /tmp/jenkins-home'`
`60`		`- sh 'chown -R 1001:1001 .'`
`61`		`- sh 'rm -rf ?'`
`62`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'`
`63`		`- sh 'chown -R 1001:1001 .'`
	`55`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'`
`64`	`56`	`}`
`65`	`57`	`}`
`66`	`58`
`@@ -69,17 +61,12 @@ pipeline {`
`69`	`61`	`docker {`
`70`	`62`	`image 'adoptopenjdk/openjdk15:latest'`
`71`	`63`	`label 'data'`
`72`		`- args '-v $HOME:/tmp/jenkins-home'`
`73`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
	`64`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`74`	`65`	`}`
`75`	`66`	`}`
`76`	`67`	`options { timeout(time: 30, unit: 'MINUTES') }`
`77`	`68`	`steps {`
`78`		`- sh 'mkdir -p /tmp/jenkins-home'`
`79`		`- sh 'chown -R 1001:1001 .'`
`80`		`- sh 'rm -rf ?'`
`81`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B'`
`82`		`- sh 'chown -R 1001:1001 .'`
	`69`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'`
`83`	`70`	`}`
`84`	`71`	`}`
`85`	`72`	`}`
`@@ -96,7 +83,7 @@ pipeline {`
`96`	`83`	`docker {`
`97`	`84`	`image 'adoptopenjdk/openjdk8:latest'`
`98`	`85`	`label 'data'`
`99`		`- args '-v $HOME:/tmp/jenkins-home'`
	`86`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`100`	`87`	`}`
`101`	`88`	`}`
`102`	`89`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -106,8 +93,7 @@ pipeline {`
`106`	`93`	`}`
`107`	`94`
`108`	`95`	`steps {`
`109`		`- sh 'rm -rf ?'`
`110`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`96`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +`
`111`	`97`	`'-Dartifactory.server=https://repo.spring.io ' +`
`112`	`98`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`113`	`99`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`@@ -125,7 +111,7 @@ pipeline {`
`125`	`111`	`docker {`
`126`	`112`	`image 'adoptopenjdk/openjdk8:latest'`
`127`	`113`	`label 'data'`
`128`		`- args '-v $HOME:/tmp/jenkins-home'`
	`114`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`129`	`115`	`}`
`130`	`116`	`}`
`131`	`117`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -135,7 +121,7 @@ pipeline {`
`135`	`121`	`}`
`136`	`122`
`137`	`123`	`steps {`
`138`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +`
	`124`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +`
`139`	`125`	`'-Dartifactory.server=https://repo.spring.io ' +`
`140`	`126`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`141`	`127`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`