Skip to content

Commit 99ade84

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #2541.
1 parent 3f53079 commit 99ade84

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

Jenkinsfile

+12-6
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
anyOf {
1824
branch '2.5.x'
@@ -29,7 +35,7 @@ pipeline {
2935
steps {
3036
script {
3137
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
32-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
38+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
3339
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3440
}
3541
}
@@ -45,7 +51,7 @@ pipeline {
4551
}
4652
}
4753
parallel {
48-
stage("test: baseline (jdk11)") {
54+
stage("test: baseline (next)") {
4955
agent {
5056
label 'data'
5157
}
@@ -56,7 +62,7 @@ pipeline {
5662
steps {
5763
script {
5864
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
59-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
65+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
6066
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
6167
}
6268
}
@@ -75,7 +81,7 @@ pipeline {
7581
steps {
7682
script {
7783
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
78-
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
84+
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
7985
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
8086
}
8187
}
@@ -104,7 +110,7 @@ pipeline {
104110
steps {
105111
script {
106112
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
107-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
113+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
108114
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
109115
'-Dartifactory.server=https://repo.spring.io ' +
110116
"-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.11.tag=11.0.13_8-jdk
4+
java.15.tag=15.0.2_7-jdk-hotspot
5+
6+
# Docker container images - standard
7+
docker.java.main.image=eclipse-temurin:${java.main.tag}
8+
docker.java.11.image=eclipse-temurin:${java.11.tag}
9+
docker.java.15.image=adoptopenjdk:${java.15.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)