@@ -58,10 +58,10 @@ pipeline {
58
58
}
59
59
}
60
60
}
61
- stage(' Publish JDK 15 + Cassandra 3.11' ) {
61
+ stage(' Publish JDK LTS + Cassandra 3.11' ) {
62
62
when {
63
63
anyOf {
64
- changeset " ci/openjdk15 -8-cassandra-3.11/**"
64
+ changeset " ci/openjdk17 -8-cassandra-3.11/**"
65
65
changeset " ci/pipeline.properties"
66
66
}
67
67
}
@@ -70,7 +70,7 @@ pipeline {
70
70
71
71
steps {
72
72
script {
73
- def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.15 .tag']} " , " --build-arg BASE=${ p['docker.java.15 .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk15 -8-cassandra-3.11/" )
73
+ def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.lts .tag']} " , " --build-arg BASE=${ p['docker.java.lts .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk17 -8-cassandra-3.11/" )
74
74
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
75
75
image. push()
76
76
}
@@ -129,13 +129,13 @@ pipeline {
129
129
docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.11.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
130
130
sh ' mkdir -p /tmp/jenkins-home'
131
131
sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
132
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
132
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
133
133
}
134
134
}
135
135
}
136
136
}
137
137
}
138
- stage(" test: baseline (jdk15 )" ) {
138
+ stage(" test: baseline (LTS )" ) {
139
139
agent {
140
140
label ' data'
141
141
}
@@ -146,10 +146,10 @@ pipeline {
146
146
steps {
147
147
script {
148
148
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
149
- docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.15 .tag']} " ). inside(p[' docker.java.inside.basic' ]) {
149
+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${ p['java.lts .tag']} " ). inside(p[' docker.java.inside.basic' ]) {
150
150
sh ' mkdir -p /tmp/jenkins-home'
151
151
sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
152
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
152
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
153
153
}
154
154
}
155
155
}
@@ -177,7 +177,7 @@ pipeline {
177
177
steps {
178
178
script {
179
179
docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
180
- docker. image(p[' docker.java.main .image' ]). inside(p[' docker.java.inside.basic' ]) {
180
+ docker. image(p[' docker.java.lts .image' ]). inside(p[' docker.java.inside.basic' ]) {
181
181
sh ' mkdir -p /tmp/jenkins-home'
182
182
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
183
183
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments