Externalize build properties.

gregturn · mp911de · commit c0d5fd7f5925 · 2022-02-04T10:54:26.000+01:00
By reading a properties file from an external location, it is possible to inject a consistent set of properties from Spring Data Build. This also supports repeatable builds. Closes #2245.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,9 @@
+def p = [:]
+node {
+    checkout scm
+    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+}
+
 pipeline {
 	agent none
 
@@ -14,38 +20,40 @@ pipeline {
 	stages {
 		stage("Docker images") {
 			parallel {
-				stage('Publish OpenJDK 8 + Redis 6.2 docker image') {
+				stage('Publish OpenJDK (main) + Redis 6.2 docker image') {
 					when {
 						anyOf {
-							changeset "ci/openjdk8-redis-6.2/**"
+							changeset "ci/openjdk8-redis-6.2/Dockerfile"
 							changeset "Makefile"
+                            changeset "ci/pipeline.properties"
 						}
 					}
 					agent { label 'data' }
 					options { timeout(time: 20, unit: 'MINUTES') }
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
+							def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk8-redis-6.2/Dockerfile .")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
 						}
 					}
 				}
-				stage('Publish OpenJDK 17 + Redis 6.2 docker image') {
+				stage('Publish OpenJDK (LTS) + Redis 6.2 docker image') {
 					when {
 						anyOf {
-							changeset "ci/openjdk16-redis-6.2/**"
+							changeset "ci/openjdk17-redis-6.2/Dockerfile"
 							changeset "Makefile"
+						    changeset "ci/pipeline.properties"
 						}
 					}
 					agent { label 'data' }
 					options { timeout(time: 20, unit: 'MINUTES') }
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis-6.2/Dockerfile .")
+							def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
@@ -55,7 +63,7 @@ pipeline {
 			}
 		}
 
-		stage("test: baseline (jdk8)") {
+		stage("test: baseline (main)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -73,7 +81,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
 							sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
 						}
 					}
@@ -90,7 +98,7 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline (jdk17)") {
+				stage("test: baseline (LTS)") {
 					agent {
 						label 'data'
 					}
@@ -101,7 +109,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image("springci/spring-data-with-redis-6.2:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
 									sh 'PROFILE=java11 ci/test.sh'
 								}
 							}
@@ -131,7 +139,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +
diff --git a/ci/openjdk17-redis-6.2/Dockerfile b/ci/openjdk17-redis-6.2/Dockerfile
@@ -1,13 +1,16 @@
-FROM openjdk:17-bullseye
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG REDIS
 
 # Copy Spring Data Redis's Makefile into the container
 COPY ./Makefile /
 
 RUN set -eux; \
-	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
+#	sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
 	apt-get update ; \
 	apt-get install -y build-essential ; \
-	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \
+	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=${REDIS}; \
 	chmod -R o+rw work; \
 	apt-get clean; \
 	rm -rf /var/lib/apt/lists/*;
diff --git a/ci/openjdk8-redis-6.2/Dockerfile b/ci/openjdk8-redis-6.2/Dockerfile
@@ -1,12 +1,15 @@
-FROM adoptopenjdk/openjdk8:latest
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG REDIS
 
 # Copy Spring Data Redis's Makefile into the container
 COPY ./Makefile /
 
 RUN set -eux; \
 	apt-get update ; \
 	apt-get install -y build-essential ; \
-	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \
+	make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=${REDIS}; \
 	chmod -R o+rw work; \
 	apt-get clean; \
 	rm -rf /var/lib/apt/lists/*;
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
@@ -0,0 +1,24 @@
+# Java versions
+java.main.tag=8u312-b07-jdk
+java.next.tag=11.0.13_8-jdk
+java.lts.tag=17.0.1_12-jdk
+
+# Docker container images - standard
+docker.java.main.image=eclipse-temurin:${java.main.tag}
+docker.java.next.image=eclipse-temurin:${java.next.tag}
+docker.java.lts.image=eclipse-temurin:${java.lts.tag}
+
+# Supported versions of MongoDB
+docker.mongodb.4.0.version=4.0.23
+docker.mongodb.4.4.version=4.4.4
+docker.mongodb.5.0.version=5.0.3
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.4
+
+# Supported versions of Cassandra
+docker.cassandra.3.version=3.11.10
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
+docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,9 @@`
	`1`	`+def p = [:]`
	`2`	`+node {`
	`3`	`+ checkout scm`
	`4`	`+ p = readProperties interpolate: true, file: 'ci/pipeline.properties'`
	`5`	`+}`
	`6`	`+`
`1`	`7`	`pipeline {`
`2`	`8`	`agent none`
`3`	`9`
`@@ -14,38 +20,40 @@ pipeline {`
`14`	`20`	`stages {`
`15`	`21`	`stage("Docker images") {`
`16`	`22`	`parallel {`
`17`		`- stage('Publish OpenJDK 8 + Redis 6.2 docker image') {`
	`23`	`+ stage('Publish OpenJDK (main) + Redis 6.2 docker image') {`
`18`	`24`	`when {`
`19`	`25`	`anyOf {`
`20`		`- changeset "ci/openjdk8-redis-6.2/**"`
	`26`	`+ changeset "ci/openjdk8-redis-6.2/Dockerfile"`
`21`	`27`	`changeset "Makefile"`
	`28`	`+ changeset "ci/pipeline.properties"`
`22`	`29`	`}`
`23`	`30`	`}`
`24`	`31`	`agent { label 'data' }`
`25`	`32`	`options { timeout(time: 20, unit: 'MINUTES') }`
`26`	`33`
`27`	`34`	`steps {`
`28`	`35`	`script {`
`29`		`- def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")`
	`36`	`+ def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk8-redis-6.2/Dockerfile .")`
`30`	`37`	`docker.withRegistry('', 'hub.docker.com-springbuildmaster') {`
`31`	`38`	`image.push()`
`32`	`39`	`}`
`33`	`40`	`}`
`34`	`41`	`}`
`35`	`42`	`}`
`36`		`- stage('Publish OpenJDK 17 + Redis 6.2 docker image') {`
	`43`	`+ stage('Publish OpenJDK (LTS) + Redis 6.2 docker image') {`
`37`	`44`	`when {`
`38`	`45`	`anyOf {`
`39`		`- changeset "ci/openjdk16-redis-6.2/**"`
	`46`	`+ changeset "ci/openjdk17-redis-6.2/Dockerfile"`
`40`	`47`	`changeset "Makefile"`
	`48`	`+ changeset "ci/pipeline.properties"`
`41`	`49`	`}`
`42`	`50`	`}`
`43`	`51`	`agent { label 'data' }`
`44`	`52`	`options { timeout(time: 20, unit: 'MINUTES') }`
`45`	`53`
`46`	`54`	`steps {`
`47`	`55`	`script {`
`48`		`- def image = docker.build("springci/spring-data-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis-6.2/Dockerfile .")`
	`56`	`+ def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")`
`49`	`57`	`docker.withRegistry('', 'hub.docker.com-springbuildmaster') {`
`50`	`58`	`image.push()`
`51`	`59`	`}`
`@@ -55,7 +63,7 @@ pipeline {`
`55`	`63`	`}`
`56`	`64`	`}`
`57`	`65`
`58`		`- stage("test: baseline (jdk8)") {`
	`66`	`+ stage("test: baseline (main)") {`
`59`	`67`	`when {`
`60`	`68`	`beforeAgent(true)`
`61`	`69`	`anyOf {`
`@@ -73,7 +81,7 @@ pipeline {`
`73`	`81`	`steps {`
`74`	`82`	`script {`
`75`	`83`	`docker.withRegistry('', 'hub.docker.com-springbuildmaster') {`
`76`		`- docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {`
	`84`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
`77`	`85`	`sh 'PROFILE=none LONG_TESTS=true ci/test.sh'`
`78`	`86`	`}`
`79`	`87`	`}`
`@@ -90,7 +98,7 @@ pipeline {`
`90`	`98`	`}`
`91`	`99`	`}`
`92`	`100`	`parallel {`
`93`		`- stage("test: baseline (jdk17)") {`
	`101`	`+ stage("test: baseline (LTS)") {`
`94`	`102`	`agent {`
`95`	`103`	`label 'data'`
`96`	`104`	`}`
`@@ -101,7 +109,7 @@ pipeline {`
`101`	`109`	`steps {`
`102`	`110`	`script {`
`103`	`111`	`docker.withRegistry('', 'hub.docker.com-springbuildmaster') {`
`104`		`- docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {`
	`112`	`+ docker.image("springci/spring-data-with-redis-6.2:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {`
`105`	`113`	`sh 'PROFILE=java11 ci/test.sh'`
`106`	`114`	`}`
`107`	`115`	`}`
`@@ -131,7 +139,7 @@ pipeline {`
`131`	`139`	`steps {`
`132`	`140`	`script {`
`133`	`141`	`docker.withRegistry('', 'hub.docker.com-springbuildmaster') {`
`134`		`- docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {`
	`142`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`135`	`143`	`sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +`
`136`	`144`	`'-Dartifactory.server=https://repo.spring.io ' +`
`137`	`145`	`"-Dartifactory.username=${ARTIFACTORY_USR} " +`