@@ -12,7 +12,7 @@ pipeline {
12
12
}
13
13
14
14
stages {
15
- stage(" test: baseline (jdk8 )" ) {
15
+ stage(" test: baseline (main )" ) {
16
16
when {
17
17
beforeAgent(true )
18
18
anyOf {
@@ -33,7 +33,7 @@ pipeline {
33
33
steps {
34
34
script {
35
35
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
36
- 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 ' ) {
36
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside. docker' ] ) {
37
37
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
38
38
sh " PROFILE=ci,all-dbs ci/test.sh"
39
39
sh " ci/clean.sh"
@@ -52,7 +52,7 @@ pipeline {
52
52
}
53
53
}
54
54
parallel {
55
- stage(" test: baseline (jdk11 )" ) {
55
+ stage(" test: baseline (next )" ) {
56
56
agent {
57
57
label ' data'
58
58
}
@@ -66,7 +66,7 @@ pipeline {
66
66
steps {
67
67
script {
68
68
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
69
- docker. image(' adoptopenjdk/openjdk11: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 ' ) {
69
+ docker. image(p[ ' docker.java.next.image ' ] ). inside(p[ ' docker.java.inside. docker' ] ) {
70
70
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
71
71
sh " PROFILE=ci,java11 ci/test.sh"
72
72
sh " ci/clean.sh"
@@ -76,7 +76,7 @@ pipeline {
76
76
}
77
77
}
78
78
79
- stage(" test: baseline (jdk17 )" ) {
79
+ stage(" test: baseline (LTS )" ) {
80
80
agent {
81
81
label ' data'
82
82
}
@@ -90,7 +90,7 @@ pipeline {
90
90
steps {
91
91
script {
92
92
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
93
- docker. image(' openjdk:17-bullseye ' ). inside(' -u root -v /var/run/ docker.sock:/var/run/docker.sock -v /usr/bin/ docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home ' ) {
93
+ docker. image(p[ ' docker.java.lts.image ' ] ). inside(p[ ' docker.java.inside. docker' ] ) {
94
94
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
95
95
sh " PROFILE=ci,java11 ci/test.sh"
96
96
sh " ci/clean.sh"
@@ -122,7 +122,7 @@ pipeline {
122
122
steps {
123
123
script {
124
124
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
125
- docker. image(' adoptopenjdk/openjdk8:latest ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
125
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
126
126
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
127
127
' -Dartifactory.server=https://repo.spring.io ' +
128
128
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments