Skip to content

Commit 56d2bf6

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #1629.
1 parent f574a38 commit 56d2bf6

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-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

@@ -23,7 +29,7 @@ pipeline {
2329
steps {
2430
script {
2531
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
26-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
32+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
2733
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
2834
}
2935
}
@@ -44,7 +50,7 @@ pipeline {
4450
steps {
4551
script {
4652
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
47-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
53+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4854
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
4955
'-Dartifactory.server=https://repo.spring.io ' +
5056
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Java versions
2+
java.main.tag=17.0.2_8-jdk
3+
4+
# Docker container images - standard
5+
docker.java.main.image=eclipse-temurin:${java.main.tag}
6+
7+
# Supported versions of MongoDB
8+
docker.mongodb.4.4.version=4.4.4
9+
docker.mongodb.5.0.version=5.0.3
10+
11+
# Supported versions of Redis
12+
docker.redis.6.version=6.2.4
13+
14+
# Supported versions of Cassandra
15+
docker.cassandra.3.version=3.11.11
16+
17+
# Docker environment settings
18+
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
19+
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)