Skip to content

Commit e6b844a

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
Closes #2413.
1 parent e930b2c commit e6b844a

File tree

2 files changed

+42
-6
lines changed

2 files changed

+42
-6
lines changed

Jenkinsfile

Lines changed: 14 additions & 6 deletions
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

@@ -29,8 +35,10 @@ pipeline {
2935
steps {
3036
script {
3137
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
32-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
33-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
38+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
39+
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
40+
sh 'PROFILE=all-dbs ci/test.sh'
41+
sh "ci/clean.sh"
3442
}
3543
}
3644
}
@@ -56,7 +64,7 @@ pipeline {
5664
steps {
5765
script {
5866
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
59-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
67+
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
6068
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
6169
}
6270
}
@@ -75,7 +83,7 @@ pipeline {
7583
steps {
7684
script {
7785
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
78-
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
86+
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
7987
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
8088
}
8189
}
@@ -104,7 +112,7 @@ pipeline {
104112
steps {
105113
script {
106114
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
107-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
115+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
108116
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
109117
'-Dartifactory.server=https://repo.spring.io ' +
110118
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -134,7 +142,7 @@ pipeline {
134142
steps {
135143
script {
136144
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
137-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
145+
docker.image(p['docker.java.main.image']).inside('-v $HOME:/tmp/jenkins-home') {
138146
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
139147
'-Dartifactory.server=https://repo.spring.io ' +
140148
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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

0 commit comments

Comments
 (0)