Skip to content

Commit eb0ceec

Browse files
committed
Update Jenkinsfile to build with a Java 17 baseline.
Closes spring-projects#2173.
1 parent d6b207f commit eb0ceec

File tree

1 file changed

+7
-92
lines changed

1 file changed

+7
-92
lines changed

Jenkinsfile

+7-92
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ pipeline {
1414
stages {
1515
stage("Docker images") {
1616
parallel {
17-
stage('Publish OpenJDK 8 + Redis 6.2 docker image') {
17+
stage('Publish JDK 17 + Redis 6.2 Docker image') {
1818
when {
1919
anyOf {
20-
changeset "ci/openjdk8-redis-6.2/**"
20+
changeset "ci/openjdk17-redis6.2/**"
2121
changeset "Makefile"
2222
}
2323
}
@@ -26,45 +26,7 @@ pipeline {
2626

2727
steps {
2828
script {
29-
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
30-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
31-
image.push()
32-
}
33-
}
34-
}
35-
}
36-
stage('Publish OpenJDK 11 + Redis 6.2 docker image') {
37-
when {
38-
anyOf {
39-
changeset "ci/openjdk11-redis-6.2/**"
40-
changeset "Makefile"
41-
}
42-
}
43-
agent { label 'data' }
44-
options { timeout(time: 20, unit: 'MINUTES') }
45-
46-
steps {
47-
script {
48-
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .")
49-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
50-
image.push()
51-
}
52-
}
53-
}
54-
}
55-
stage('Publish OpenJDK 16 + Redis 6.2 docker image') {
56-
when {
57-
anyOf {
58-
changeset "ci/openjdk16-redis-6.2/**"
59-
changeset "Makefile"
60-
}
61-
}
62-
agent { label 'data' }
63-
options { timeout(time: 20, unit: 'MINUTES') }
64-
65-
steps {
66-
script {
67-
def image = docker.build("springci/spring-data-openjdk16-with-redis-6.2", "-f ci/openjdk16-redis-6.2/Dockerfile .")
29+
def image = docker.build("springci/spring-data-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis6.2/Dockerfile .")
6830
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6931
image.push()
7032
}
@@ -74,7 +36,7 @@ pipeline {
7436
}
7537
}
7638

77-
stage("test: baseline (jdk8)") {
39+
stage("test: baseline (Java 17)") {
7840
when {
7941
anyOf {
8042
branch 'main'
@@ -91,61 +53,14 @@ pipeline {
9153
steps {
9254
script {
9355
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
94-
docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
56+
docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
9557
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
9658
}
9759
}
9860
}
9961
}
10062
}
10163

102-
stage("Test other configurations") {
103-
when {
104-
allOf {
105-
branch 'main'
106-
not { triggeredBy 'UpstreamCause' }
107-
}
108-
}
109-
parallel {
110-
stage("test: baseline (jdk11)") {
111-
agent {
112-
label 'data'
113-
}
114-
options { timeout(time: 30, unit: 'MINUTES') }
115-
environment {
116-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
117-
}
118-
steps {
119-
script {
120-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
121-
docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
122-
sh 'PROFILE=java11 ci/test.sh'
123-
}
124-
}
125-
}
126-
}
127-
}
128-
stage("test: baseline (jdk16)") {
129-
agent {
130-
label 'data'
131-
}
132-
options { timeout(time: 30, unit: 'MINUTES') }
133-
environment {
134-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
135-
}
136-
steps {
137-
script {
138-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
139-
docker.image('springci/spring-data-openjdk16-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
140-
sh 'PROFILE=java11 ci/test.sh'
141-
}
142-
}
143-
}
144-
}
145-
}
146-
}
147-
}
148-
14964
stage('Release to artifactory') {
15065
when {
15166
anyOf {
@@ -165,7 +80,7 @@ pipeline {
16580
steps {
16681
script {
16782
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
168-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
83+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
16984
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
17085
'-Dartifactory.server=https://repo.spring.io ' +
17186
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -196,7 +111,7 @@ pipeline {
196111
steps {
197112
script {
198113
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
199-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
114+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
200115
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
201116
'-Dartifactory.server=https://repo.spring.io ' +
202117
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)