Skip to content

Commit 5bfee6d

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #73.
1 parent 763f4bc commit 5bfee6d

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

Jenkinsfile

+8-2
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

@@ -33,7 +39,7 @@ pipeline {
3339
steps {
3440
script {
3541
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
36-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
42+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
3743
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -B -U'
3844
}
3945
}
@@ -61,7 +67,7 @@ pipeline {
6167
steps {
6268
script {
6369
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
64-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
70+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
6571
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Partifactory ' +
6672
'-Dartifactory.server=https://repo.spring.io ' +
6773
"-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)