Skip to content

Commit da9fcb4

Browse files
odrotbohmodrotbohm
committed
Upgrade CI build to JDK 17.
Issue: #2068.
1 parent a8e2261 commit da9fcb4

File tree

4 files changed

+6
-142
lines changed

4 files changed

+6
-142
lines changed

‎CI.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ All of these use cases are great reasons to essentially run what the CI server d
1616

1717
IMPORTANT: To do this you must have Docker installed on your machine.
1818

19-
1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-rest-github adoptopenjdk/openjdk8:latest /bin/bash`
19+
1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-rest-github openjdk:17 /bin/bash`
2020
+
2121
This will launch the Docker image and mount your source code at `spring-data-rest-github`.
2222
+
@@ -30,7 +30,7 @@ Since the container is binding to your source, you can make edits from your IDE
3030

3131
If you test building the artifact, do this:
3232

33-
1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-rest-github adoptopenjdk/openjdk8:latest /bin/bash`
33+
1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-rest-github openjdk:17 /bin/bash`
3434
+
3535
This will launch the Docker image and mount your source code at `spring-data-rest-github`.
3636
+

‎Jenkinsfile

+4-108
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
stages {
1616
stage("Docker images") {
1717
parallel {
18-
stage('Publish JDK 8 + MongoDB 4.4') {
18+
stage('Publish JDK 17 + MongoDB 4.4') {
1919
when {
2020
changeset "ci/openjdk8-mongodb-4.4/**"
2121
}
@@ -66,7 +66,7 @@ pipeline {
6666
}
6767
}
6868

69-
stage("test: baseline (jdk8)") {
69+
stage("test: baseline (JDK 17)") {
7070
when {
7171
beforeAgent(true)
7272
anyOf {
@@ -84,7 +84,7 @@ pipeline {
8484
steps {
8585
script {
8686
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
87-
docker.image('springci/spring-data-rest-openjdk8-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
87+
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
8888
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
8989
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
9090
sh 'sleep 10'
@@ -97,110 +97,6 @@ pipeline {
9797
}
9898
}
9999

100-
stage("Test other configurations") {
101-
when {
102-
beforeAgent(true)
103-
allOf {
104-
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
105-
not { triggeredBy 'UpstreamCause' }
106-
}
107-
}
108-
parallel {
109-
stage("test: baseline (jdk11)") {
110-
agent {
111-
label 'data'
112-
}
113-
options { timeout(time: 30, unit: 'MINUTES') }
114-
environment {
115-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
116-
}
117-
steps {
118-
script {
119-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
120-
docker.image('springci/spring-data-rest-openjdk11-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
121-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
122-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
123-
sh 'sleep 10'
124-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
125-
sh 'sleep 15'
126-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit,java11'
127-
}
128-
}
129-
}
130-
}
131-
}
132-
stage("test: baseline (JDK 17)") {
133-
agent {
134-
label 'data'
135-
}
136-
options { timeout(time: 30, unit: 'MINUTES') }
137-
environment {
138-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
139-
}
140-
steps {
141-
script {
142-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
143-
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
144-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
145-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
146-
sh 'sleep 10'
147-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
148-
sh 'sleep 15'
149-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit,java11'
150-
}
151-
}
152-
}
153-
}
154-
}
155-
stage("test: spring53-next (jdk8)") {
156-
agent {
157-
label 'data'
158-
}
159-
options { timeout(time: 30, unit: 'MINUTES') }
160-
environment {
161-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
162-
}
163-
steps {
164-
script {
165-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
166-
docker.image('springci/spring-data-rest-openjdk8-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
167-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
168-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
169-
sh 'sleep 10'
170-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
171-
sh 'sleep 15'
172-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit,spring53-next'
173-
}
174-
}
175-
}
176-
}
177-
}
178-
stage("test: spring53-next (JDK 17)") {
179-
agent {
180-
label 'data'
181-
}
182-
options { timeout(time: 30, unit: 'MINUTES') }
183-
environment {
184-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
185-
}
186-
steps {
187-
script {
188-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
189-
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
190-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
191-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
192-
sh 'sleep 10'
193-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
194-
sh 'sleep 15'
195-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit,spring53-next,java11'
196-
}
197-
}
198-
}
199-
}
200-
}
201-
}
202-
}
203-
204100
stage('Release to artifactory') {
205101
when {
206102
beforeAgent(true)
@@ -221,7 +117,7 @@ pipeline {
221117
steps {
222118
script {
223119
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
224-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
120+
docker.image('openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
225121
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
226122
'-Dartifactory.server=https://repo.spring.io ' +
227123
"-Dartifactory.username=${ARTIFACTORY_USR} " +

‎ci/openjdk11-mongodb-4.4/Dockerfile

-15
This file was deleted.

‎ci/openjdk8-mongodb-4.4/Dockerfile

-17
This file was deleted.

0 commit comments

Comments
 (0)