Skip to content

Commit 8220c60

Browse files
odrotbohmodrotbohm
committed
Upgrade CI build to JDK 17.
Issue: #2068.
1 parent 4d19192 commit 8220c60

File tree

5 files changed

+11
-177
lines changed

5 files changed

+11
-177
lines changed

‎CI.adoc

Lines changed: 2 additions & 2 deletions
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

Lines changed: 7 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,16 @@ 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 {
20-
changeset "ci/openjdk8-mongodb-4.4/**"
20+
changeset "ci/openjdk17-mongodb-4.4/**"
2121
}
2222
agent { label 'data' }
2323
options { timeout(time: 30, unit: 'MINUTES') }
2424

2525
steps {
2626
script {
27-
def image = docker.build("springci/spring-data-rest-openjdk8-with-mongodb-4.4", "ci/openjdk8-mongodb-4.4/")
28-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
29-
image.push()
30-
}
31-
}
32-
}
33-
}
34-
stage('Publish JDK 11 + MongoDB 4.4') {
35-
when {
36-
changeset "ci/openjdk11-mongodb-4.4/**"
37-
}
38-
agent { label 'data' }
39-
options { timeout(time: 30, unit: 'MINUTES') }
40-
41-
steps {
42-
script {
43-
def image = docker.build("springci/spring-data-rest-openjdk11-with-mongodb-4.4", "ci/openjdk8-mongodb-4.4/")
44-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
45-
image.push()
46-
}
47-
}
48-
}
49-
}
50-
stage('Publish JDK 16 + MongoDB 4.4') {
51-
when {
52-
changeset "ci/openjdk16-mongodb-4.4/**"
53-
}
54-
agent { label 'data' }
55-
options { timeout(time: 30, unit: 'MINUTES') }
56-
57-
steps {
58-
script {
59-
def image = docker.build("springci/spring-data-rest-openjdk16-with-mongodb-4.4", "ci/openjdk16-mongodb-4.4/")
27+
def image = docker.build("springci/spring-data-rest-openjdk17-with-mongodb-4.4", "ci/openjdk17-mongodb-4.4/")
6028
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6129
image.push()
6230
}
@@ -66,7 +34,7 @@ pipeline {
6634
}
6735
}
6836

69-
stage("test: baseline (jdk8)") {
37+
stage("test: baseline (JDK 17)") {
7038
when {
7139
anyOf {
7240
branch 'main'
@@ -83,7 +51,7 @@ pipeline {
8351
steps {
8452
script {
8553
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
86-
docker.image('springci/spring-data-rest-openjdk8-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
54+
docker.image('springci/spring-data-rest-openjdk17-with-mongodb-4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
8755
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
8856
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
8957
sh 'sleep 10'
@@ -96,109 +64,6 @@ pipeline {
9664
}
9765
}
9866

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

‎ci/openjdk16-mongodb-4.4/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎ci/openjdk11-mongodb-4.4/Dockerfile renamed to ‎ci/openjdk17-mongodb-4.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM adoptopenjdk/openjdk11:latest
1+
FROM openjdk:17-bullseye
22

33
ENV TZ=Etc/UTC
44
ENV DEBIAN_FRONTEND=noninteractive
55

6+
RUN sed -i -e 's/http/https/g' /etc/apt/sources.list
67
RUN set -eux; \
78
apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
89
apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \

‎ci/openjdk8-mongodb-4.4/Dockerfile

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)