Skip to content

Commit 0dcf12c

Browse files
committed
Externalize build properties.
See #1151.
1 parent cef041f commit 0dcf12c

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 {
@@ -33,7 +39,7 @@ pipeline {
3339
steps {
3440
script {
3541
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
36-
docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
42+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
3743
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3844
sh "PROFILE=ci,all-dbs ci/test.sh"
3945
sh "ci/clean.sh"
@@ -52,7 +58,7 @@ pipeline {
5258
}
5359
}
5460
parallel {
55-
stage("test: baseline (jdk11)") {
61+
stage("test: baseline (next)") {
5662
agent {
5763
label 'data'
5864
}
@@ -66,7 +72,7 @@ pipeline {
6672
steps {
6773
script {
6874
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69-
docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
75+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
7076
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
7177
sh "PROFILE=ci,java11 ci/test.sh"
7278
sh "ci/clean.sh"
@@ -76,7 +82,7 @@ pipeline {
7682
}
7783
}
7884

79-
stage("test: baseline (jdk17)") {
85+
stage("test: baseline (LTS)") {
8086
agent {
8187
label 'data'
8288
}
@@ -90,7 +96,7 @@ pipeline {
9096
steps {
9197
script {
9298
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
93-
docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
99+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
94100
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
95101
sh "PROFILE=ci,java11 ci/test.sh"
96102
sh "ci/clean.sh"
@@ -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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
127133
'-Dartifactory.server=https://repo.spring.io ' +
128134
"-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)