DATAJDBC-628 - Enable Maven caching for Jenkins jobs.

mp911de · mp911de · commit 9128ea756430 · 2020-10-30T08:50:08.000+01:00
Also, run all database integration tests for Java 8 baseline only.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,17 +23,15 @@ 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 './accept-third-party-license.sh'
 				sh 'mkdir -p /tmp/jenkins-home'
 				sh 'chown -R 1001:1001 .'
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
-				sh 'chown -R 1001:1001 .'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc'
 			}
 		}
 
@@ -50,17 +48,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 './accept-third-party-license.sh'
-						sh 'mkdir -p /tmp/jenkins-home'
-						sh 'chown -R 1001:1001 .'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
-						sh 'chown -R 1001:1001 .'
+						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-jdbc'
 					}
 				}
 
@@ -69,17 +63,13 @@ 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 './accept-third-party-license.sh'
-                		sh 'mkdir -p /tmp/jenkins-home'
-						sh 'chown -R 1001:1001 .'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
-						sh 'chown -R 1001:1001 .'
+						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-jdbc'
 					}
 				}
 			}
@@ -96,7 +86,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
+					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 +96,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'mkdir -p /tmp/jenkins-home'
-				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-jdbc ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -126,7 +115,7 @@ pipeline {
 				docker {
 					image 'adoptopenjdk/openjdk8:latest'
 					label 'data'
-					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
+					args '-u root -v /var/run/docker.sock:/var/run/docker.sock  -v $HOME:/tmp/jenkins-home'
 				}
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
@@ -136,8 +125,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'mkdir -p /tmp/jenkins-home'
-				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-jdbc ' +
 						'-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,15 @@ 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`	`31`	`sh './accept-third-party-license.sh'`
`33`	`32`	`sh 'mkdir -p /tmp/jenkins-home'`
`34`	`33`	`sh 'chown -R 1001:1001 .'`
`35`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'`
`36`		`- sh 'chown -R 1001:1001 .'`
	`34`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc'`
`37`	`35`	`}`
`38`	`36`	`}`
`39`	`37`
`@@ -50,17 +48,13 @@ pipeline {`
`50`	`48`	`docker {`
`51`	`49`	`image 'adoptopenjdk/openjdk11:latest'`
`52`	`50`	`label 'data'`
`53`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`54`		`- // root but with no maven caching`
	`51`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`55`	`52`	`}`
`56`	`53`	`}`
`57`	`54`	`options { timeout(time: 30, unit: 'MINUTES') }`
`58`	`55`	`steps {`
`59`	`56`	`sh './accept-third-party-license.sh'`
`60`		`- sh 'mkdir -p /tmp/jenkins-home'`
`61`		`- sh 'chown -R 1001:1001 .'`
`62`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'`
`63`		`- sh 'chown -R 1001:1001 .'`
	`57`	`+ 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-jdbc'`
`64`	`58`	`}`
`65`	`59`	`}`
`66`	`60`
`@@ -69,17 +63,13 @@ pipeline {`
`69`	`63`	`docker {`
`70`	`64`	`image 'adoptopenjdk/openjdk15:latest'`
`71`	`65`	`label 'data'`
`72`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`73`		`- // root but with no maven caching`
	`66`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`74`	`67`	`}`
`75`	`68`	`}`
`76`	`69`	`options { timeout(time: 30, unit: 'MINUTES') }`
`77`	`70`	`steps {`
`78`	`71`	`sh './accept-third-party-license.sh'`
`79`		`- sh 'mkdir -p /tmp/jenkins-home'`
`80`		`- sh 'chown -R 1001:1001 .'`
`81`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'`
`82`		`- sh 'chown -R 1001:1001 .'`
	`72`	`+ 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-jdbc'`
`83`	`73`	`}`
`84`	`74`	`}`
`85`	`75`	`}`
`@@ -96,7 +86,7 @@ pipeline {`
`96`	`86`	`docker {`
`97`	`87`	`image 'adoptopenjdk/openjdk8:latest'`
`98`	`88`	`label 'data'`
`99`		`- args '-v $HOME/.m2:/tmp/jenkins-home/.m2'`
	`89`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`100`	`90`	`}`
`101`	`91`	`}`
`102`	`92`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -106,8 +96,7 @@ pipeline {`
`106`	`96`	`}`
`107`	`97`
`108`	`98`	`steps {`
`109`		`- sh 'mkdir -p /tmp/jenkins-home'`
`110`		`- 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-jdbc ' +`
`111`	`100`	`'-Dartifactory.server=https://repo.spring.io ' +`
`112`	`101`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`113`	`102`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`@@ -126,7 +115,7 @@ pipeline {`
`126`	`115`	`docker {`
`127`	`116`	`image 'adoptopenjdk/openjdk8:latest'`
`128`	`117`	`label 'data'`
`129`		`- args '-v $HOME/.m2:/tmp/jenkins-home/.m2'`
	`118`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`130`	`119`	`}`
`131`	`120`	`}`
`132`	`121`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -136,8 +125,7 @@ pipeline {`
`136`	`125`	`}`
`137`	`126`
`138`	`127`	`steps {`
`139`		`- sh 'mkdir -p /tmp/jenkins-home'`
`140`		`- 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-jdbc ' +`
`141`	`129`	`'-Dartifactory.server=https://repo.spring.io ' +`
`142`	`130`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`143`	`131`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`