Skip to content

Commit 4f6bed0

Browse files
committed
Externalize build properties.
See #1151.
1 parent b846fac commit 4f6bed0

File tree

2 files changed

+31
-7
lines changed

2 files changed

+31
-7
lines changed

Jenkinsfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (main)") {
1616
when {
1717
beforeAgent(true)
1818
anyOf {
@@ -33,7 +33,7 @@ pipeline {
3333
steps {
3434
script {
3535
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') {
36+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
3737
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3838
sh "PROFILE=ci,all-dbs ci/test.sh"
3939
sh "ci/clean.sh"
@@ -52,7 +52,7 @@ pipeline {
5252
}
5353
}
5454
parallel {
55-
stage("test: baseline (jdk11)") {
55+
stage("test: baseline (next)") {
5656
agent {
5757
label 'data'
5858
}
@@ -66,7 +66,7 @@ pipeline {
6666
steps {
6767
script {
6868
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') {
69+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
7070
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
7171
sh "PROFILE=ci,java11 ci/test.sh"
7272
sh "ci/clean.sh"
@@ -76,7 +76,7 @@ pipeline {
7676
}
7777
}
7878

79-
stage("test: baseline (jdk17)") {
79+
stage("test: baseline (LTS)") {
8080
agent {
8181
label 'data'
8282
}
@@ -90,7 +90,7 @@ pipeline {
9090
steps {
9191
script {
9292
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') {
93+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
9494
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
9595
sh "PROFILE=ci,java11 ci/test.sh"
9696
sh "ci/clean.sh"
@@ -122,7 +122,7 @@ pipeline {
122122
steps {
123123
script {
124124
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
125-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
125+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
126126
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 ' +
127127
'-Dartifactory.server=https://repo.spring.io ' +
128128
"-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)