Skip to content

Commit f9e7d53

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #569.
1 parent 7f7e1d2 commit f9e7d53

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 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
3541
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
3642
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -53,7 +59,7 @@ pipeline {
5359
}
5460
}
5561
parallel {
56-
stage("test: baseline (jdk11)") {
62+
stage("test: baseline (next)") {
5763
agent {
5864
label 'data'
5965
}
@@ -64,7 +70,7 @@ pipeline {
6470
steps {
6571
script {
6672
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
67-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
73+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
6874
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
6975
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
7076
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -78,7 +84,7 @@ pipeline {
7884
}
7985
}
8086

81-
stage("test: baseline (jdk17)") {
87+
stage("test: baseline (LTS)") {
8288
agent {
8389
label 'data'
8490
}
@@ -89,7 +95,7 @@ pipeline {
8995
steps {
9096
script {
9197
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
92-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
98+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
9399
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
94100
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
95101
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -125,7 +131,7 @@ pipeline {
125131
steps {
126132
script {
127133
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
128-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
134+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
129135
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
130136
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
131137
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'

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)