1
+ def p = [:]
2
+ node {
3
+ p = readProperties file : ' ci/pipeline.properties'
4
+ }
5
+
1
6
pipeline {
2
7
agent none
3
8
@@ -31,7 +36,7 @@ pipeline {
31
36
steps {
32
37
script {
33
38
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
34
- docker. image(' adoptopenjdk/openjdk8:latest ' ). inside(' -u root -v /var/run/ docker.sock:/var/run/docker.sock -v /usr/bin/ docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home ' ) {
39
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside. docker' ] ) {
35
40
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
36
41
sh ' PROFILE=all-dbs ci/test.sh'
37
42
sh " ci/clean.sh"
@@ -61,7 +66,7 @@ pipeline {
61
66
steps {
62
67
script {
63
68
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
64
- docker. image(' adoptopenjdk/openjdk11:latest ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
69
+ docker. image(p[ ' docker.java.next.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
65
70
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
66
71
}
67
72
}
@@ -80,7 +85,7 @@ pipeline {
80
85
steps {
81
86
script {
82
87
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
83
- docker. image(' openjdk:17-bullseye ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
88
+ docker. image(p[ ' docker.java.lts.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
84
89
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
85
90
}
86
91
}
@@ -110,7 +115,7 @@ pipeline {
110
115
steps {
111
116
script {
112
117
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
113
- docker. image(' adoptopenjdk/openjdk8:latest ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
118
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
114
119
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
115
120
' -Dartifactory.server=https://repo.spring.io ' +
116
121
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments