Skip to content

Commit 52d8976

Browse files
committed
Externalize build properties.
See #2541.
1 parent ca5676d commit 52d8976

File tree

2 files changed

+37
-7
lines changed

2 files changed

+37
-7
lines changed

Jenkinsfile

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
def p = [:]
2+
node {
3+
checkout scm
4+
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
5+
}
6+
17
pipeline {
28
agent none
39

@@ -12,7 +18,7 @@ pipeline {
1218
}
1319

1420
stages {
15-
stage("test: baseline (jdk8)") {
21+
stage("test: baseline (main)") {
1622
when {
1723
beforeAgent(true)
1824
anyOf {
@@ -30,7 +36,7 @@ pipeline {
3036
steps {
3137
script {
3238
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
33-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
39+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
3440
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3541
}
3642
}
@@ -47,7 +53,7 @@ pipeline {
4753
}
4854
}
4955
parallel {
50-
stage("test: baseline (jdk11)") {
56+
stage("test: baseline (next)") {
5157
agent {
5258
label 'data'
5359
}
@@ -58,15 +64,15 @@ pipeline {
5864
steps {
5965
script {
6066
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
61-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
67+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
6268
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
6369
}
6470
}
6571
}
6672
}
6773
}
6874

69-
stage("test: baseline (jdk17)") {
75+
stage("test: baseline (LTS)") {
7076
agent {
7177
label 'data'
7278
}
@@ -77,7 +83,7 @@ pipeline {
7783
steps {
7884
script {
7985
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
80-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
86+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
8187
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
8288
}
8389
}
@@ -107,7 +113,7 @@ pipeline {
107113
steps {
108114
script {
109115
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
110-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
116+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
111117
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
112118
'-Dartifactory.server=https://repo.spring.io ' +
113119
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Java versions
2+
java.main.tag=8u312-b07-jdk
3+
java.next.tag=11.0.13_8-jdk
4+
java.lts.tag=17.0.1_12-jdk
5+
6+
# Docker container images - standard
7+
docker.java.main.image=eclipse-temurin:${java.main.tag}
8+
docker.java.next.image=eclipse-temurin:${java.next.tag}
9+
docker.java.lts.image=eclipse-temurin:${java.lts.tag}
10+
11+
# Supported versions of MongoDB
12+
docker.mongodb.4.0.version=4.0.23
13+
docker.mongodb.4.4.version=4.4.4
14+
docker.mongodb.5.0.version=5.0.3
15+
16+
# Supported versions of Redis
17+
docker.redis.6.version=6.2.4
18+
19+
# Supported versions of Cassandra
20+
docker.cassandra.3.version=3.11.10
21+
22+
# Docker environment settings
23+
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
24+
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home

0 commit comments

Comments
 (0)