DATAJDBC-628 - Enable Maven caching for Jenkins jobs.

mp911de · mp911de · commit f729542900ad · 2020-10-30T08:51:58.000+01:00
Also, run all database integration tests for Java 8 baseline only.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,15 +25,14 @@ 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 '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 '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'
 						sh 'chown -R 1001:1001 .'
 					}
 				}
@@ -50,7 +49,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') }
@@ -60,8 +59,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} " +
@@ -79,7 +77,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') }
@@ -89,8 +87,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
`@@ -25,15 +25,14 @@ pipeline {`
`25`	`25`	`docker {`
`26`	`26`	`image 'adoptopenjdk/openjdk8:latest'`
`27`	`27`	`label 'data'`
`28`		`- args '-u root -v /var/run/docker.sock:/var/run/docker.sock'`
`29`		`- // root but with no maven caching`
	`28`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`	`options { timeout(time: 30, unit: 'MINUTES') }`
`33`	`32`	`steps {`
`34`	`33`	`sh 'mkdir -p /tmp/jenkins-home'`
`35`	`34`	`sh 'chown -R 1001:1001 .'`
`36`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'`
	`35`	`+ 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`	`36`	`sh 'chown -R 1001:1001 .'`
`38`	`37`	`}`
`39`	`38`	`}`
`@@ -50,7 +49,7 @@ pipeline {`
`50`	`49`	`docker {`
`51`	`50`	`image 'adoptopenjdk/openjdk8:latest'`
`52`	`51`	`label 'data'`
`53`		`- args '-v $HOME/.m2:/tmp/jenkins-home/.m2'`
	`52`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`54`	`53`	`}`
`55`	`54`	`}`
`56`	`55`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -60,8 +59,7 @@ pipeline {`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`steps {`
`63`		`- sh 'mkdir -p /tmp/jenkins-home'`
`64`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`62`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc ' +`
`65`	`63`	`'-Dartifactory.server=https://repo.spring.io ' +`
`66`	`64`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`67`	`65`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`@@ -79,7 +77,7 @@ pipeline {`
`79`	`77`	`docker {`
`80`	`78`	`image 'adoptopenjdk/openjdk8:latest'`
`81`	`79`	`label 'data'`
`82`		`- args '-v $HOME/.m2:/tmp/jenkins-home/.m2'`
	`80`	`+ args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -89,8 +87,7 @@ pipeline {`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`steps {`
`92`		`- sh 'mkdir -p /tmp/jenkins-home'`
`93`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +`
	`90`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc ' +`
`94`	`91`	`'-Dartifactory.server=https://repo.spring.io ' +`
`95`	`92`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`
`96`	`93`	`"-Dartifactory.password=${ARTIFACTORY_PSW} " +`