#490 - Enable Maven caching for Jenkins jobs.

mp911de · mp911de · commit 0516046ef673 · 2020-10-29T16:17:43.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,14 +23,13 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
-					// root but with no maven caching
+					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 -Pci clean dependency:list test -Dsort -U -B'
+				sh 'mkdir -p /tmp/jenkins-home/.m2/spring-data-r2dbc'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'
 				sh "chown -R 1001:1001 target"
 			}
 		}
@@ -48,14 +47,13 @@ pipeline {
 						docker {
 							image 'adoptopenjdk/openjdk11:latest'
 							label 'data'
-							args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
-							// root but with no maven caching
+							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 -Pci,java11 clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'
 						sh "chown -R 1001:1001 target"
 					}
 				}
@@ -65,14 +63,12 @@ pipeline {
 						docker {
 							image 'adoptopenjdk/openjdk15:latest'
 							label 'data'
-							args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
-							// root but with no maven caching
+							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 -Pci,java11 clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'
 						sh "chown -R 1001:1001 target"
 					}
 				}
@@ -90,7 +86,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') }
@@ -100,8 +96,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-r2dbc ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -120,7 +115,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') }
@@ -130,7 +125,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-r2dbc ' +
 						'-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,14 +23,13 @@ pipeline {`
`23`	`23`	`docker {`
`24`	`24`	`image 'adoptopenjdk/openjdk8:latest'`
`25`	`25`	`label 'data'`
`26`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`27`		`- // root but with no maven caching`
	`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`		`- sh 'rm -rf ?'`
`33`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci clean dependency:list test -Dsort -U -B'`
	`31`	`+ sh 'mkdir -p /tmp/jenkins-home/.m2/spring-data-r2dbc'`
	`32`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'`
`34`	`33`	`sh "chown -R 1001:1001 target"`
`35`	`34`	`}`
`36`	`35`	`}`
`@@ -48,14 +47,13 @@ pipeline {`
`48`	`47`	`docker {`
`49`	`48`	`image 'adoptopenjdk/openjdk11:latest'`
`50`	`49`	`label 'data'`
`51`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`52`		`- // root but with no maven caching`
	`50`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`53`	`51`	`}`
`54`	`52`	`}`
`55`	`53`	`options { timeout(time: 30, unit: 'MINUTES') }`
`56`	`54`	`steps {`
`57`	`55`	`sh 'rm -rf ?'`
`58`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B'`
	`56`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'`
`59`	`57`	`sh "chown -R 1001:1001 target"`
`60`	`58`	`}`
`61`	`59`	`}`
`@@ -65,14 +63,12 @@ pipeline {`
`65`	`63`	`docker {`
`66`	`64`	`image 'adoptopenjdk/openjdk15:latest'`
`67`	`65`	`label 'data'`
`68`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`69`		`- // root but with no maven caching`
	`66`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`70`	`67`	`}`
`71`	`68`	`}`
`72`	`69`	`options { timeout(time: 30, unit: 'MINUTES') }`
`73`	`70`	`steps {`
`74`		`- sh 'rm -rf ?'`
`75`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B'`
	`71`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,java11 clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc'`
`76`	`72`	`sh "chown -R 1001:1001 target"`
`77`	`73`	`}`
`78`	`74`	`}`
`@@ -90,7 +86,7 @@ pipeline {`
`90`	`86`	`docker {`
`91`	`87`	`image 'adoptopenjdk/openjdk8:latest'`
`92`	`88`	`label 'data'`
`93`		`- args '-v $HOME:/tmp/jenkins-home'`
	`89`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`94`	`90`	`}`
`95`	`91`	`}`
`96`	`92`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -100,8 +96,7 @@ pipeline {`
`100`	`96`	`}`
`101`	`97`
`102`	`98`	`steps {`
`103`		`- sh 'rm -rf ?'`
`104`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`99`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc ' +`
`105`	`100`	`'-Dartifactory.server=https://repo.spring.io ' +`
`106`	`101`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`107`	`102`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`@@ -120,7 +115,7 @@ pipeline {`
`120`	`115`	`docker {`
`121`	`116`	`image 'adoptopenjdk/openjdk8:latest'`
`122`	`117`	`label 'data'`
`123`		`- args '-v $HOME:/tmp/jenkins-home'`
	`118`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`124`	`119`	`}`
`125`	`120`	`}`
`126`	`121`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -130,7 +125,7 @@ pipeline {`
`130`	`125`	`}`
`131`	`126`
`132`	`127`	`steps {`
`133`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +`
	`128`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc ' +`
`134`	`129`	`'-Dartifactory.server=https://repo.spring.io ' +`
`135`	`130`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`136`	`131`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`