Skip to content

Commit dd01100

Browse files
committed
Use Java 17 to build snapshots for Artifactory.
Closes #2268
1 parent 2a1bbb3 commit dd01100

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

Jenkinsfile

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ pipeline {
6060
}
6161
}
6262
}
63-
stage('Publish OpenJDK 15 + Redis 6.2 docker image') {
63+
stage('Publish OpenJDK LTS + Redis 6.2 docker image') {
6464
when {
6565
anyOf {
66-
changeset "ci/openjdk15-redis-6.2/**"
66+
changeset "ci/openjdk17-redis-6.2/**"
6767
changeset "Makefile"
6868
changeset "ci/pipeline.properties"
6969
}
@@ -73,7 +73,7 @@ pipeline {
7373

7474
steps {
7575
script {
76-
def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.15.tag']}", "--build-arg BASE=${p['docker.java.15.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")
76+
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 .")
7777
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7878
image.push()
7979
}
@@ -128,13 +128,13 @@ pipeline {
128128
script {
129129
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
130130
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
131-
sh 'PROFILE=java11 ci/test.sh'
131+
sh 'PROFILE=none ci/test.sh'
132132
}
133133
}
134134
}
135135
}
136136
}
137-
stage("test: baseline (jdk15)") {
137+
stage("test: baseline (LTS)") {
138138
agent {
139139
label 'data'
140140
}
@@ -145,8 +145,8 @@ pipeline {
145145
steps {
146146
script {
147147
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
148-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.15.tag']}").inside(p['docker.java.inside.basic']) {
149-
sh 'PROFILE=java11 ci/test.sh'
148+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
149+
sh 'PROFILE=none ci/test.sh'
150150
}
151151
}
152152
}
@@ -174,7 +174,7 @@ pipeline {
174174
steps {
175175
script {
176176
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
177-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
177+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
178178
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
179179
'-Dartifactory.server=https://repo.spring.io ' +
180180
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -188,35 +188,6 @@ pipeline {
188188
}
189189
}
190190
}
191-
192-
stage('Publish documentation') {
193-
when {
194-
branch '2.5.x'
195-
}
196-
agent {
197-
label 'data'
198-
}
199-
options { timeout(time: 20, unit: 'MINUTES') }
200-
201-
environment {
202-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
203-
}
204-
205-
steps {
206-
script {
207-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
208-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
209-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
210-
'-Dartifactory.server=https://repo.spring.io ' +
211-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
212-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
213-
"-Dartifactory.distribution-repository=temp-private-local " +
214-
'-Dmaven.test.skip=true clean deploy -U -B'
215-
}
216-
}
217-
}
218-
}
219-
}
220191
}
221192

222193
post {
File renamed without changes.

0 commit comments

Comments
 (0)