Skip to content

Commit 8a6cf2e

Browse files
committed
Externalize build properties.
See #1629.
1 parent d1afd37 commit 8a6cf2e

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
agent {
1723
label 'data'
1824
}
@@ -23,7 +29,7 @@ pipeline {
2329
steps {
2430
script {
2531
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
26-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
32+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
2733
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
2834
}
2935
}
@@ -36,7 +42,7 @@ pipeline {
3642
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
3743
}
3844
parallel {
39-
stage("test: baseline (jdk11)") {
45+
stage("test: baseline (next)") {
4046
agent {
4147
label 'data'
4248
}
@@ -47,15 +53,15 @@ pipeline {
4753
steps {
4854
script {
4955
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
50-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
56+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
5157
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
5258
}
5359
}
5460
}
5561
}
5662
}
5763

58-
stage("test: baseline (jdk17)") {
64+
stage("test: baseline (LTS)") {
5965
agent {
6066
label 'data'
6167
}
@@ -66,7 +72,7 @@ pipeline {
6672
steps {
6773
script {
6874
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
75+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
7076
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
7177
}
7278
}
@@ -89,7 +95,7 @@ pipeline {
8995
steps {
9096
script {
9197
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
92-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
98+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
9399
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
94100
'-Dartifactory.server=https://repo.spring.io ' +
95101
"-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)