Skip to content

Commit e81ce2f

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #569.
1 parent c75e865 commit e81ce2f

File tree

2 files changed

+41
-6
lines changed

2 files changed

+41
-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 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
3440
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
3541
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -51,7 +57,7 @@ pipeline {
5157
}
5258
}
5359
parallel {
54-
stage("test: baseline (jdk11)") {
60+
stage("test: baseline (next)") {
5561
agent {
5662
label 'data'
5763
}
@@ -62,7 +68,7 @@ pipeline {
6268
steps {
6369
script {
6470
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
65-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
71+
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
6672
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
6773
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
6874
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -87,7 +93,7 @@ pipeline {
8793
steps {
8894
script {
8995
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
90-
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
96+
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
9197
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
9298
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
9399
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
@@ -122,7 +128,7 @@ pipeline {
122128
steps {
123129
script {
124130
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
125-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
131+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
126132
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
127133
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
128134
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'

ci/pipeline.properties

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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
25+
26+
# Credentials
27+
docker.registry=
28+
docker.credentials=hub.docker.com-springbuildmaster
29+
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c

0 commit comments

Comments
 (0)