Skip to content

Commit 0ab2534

Browse files
gregturnmp911de
authored andcommitted
Externalize build properties.
See #2074.
1 parent 0d2a6b9 commit 0ab2534

File tree

2 files changed

+38
-8
lines changed

2 files changed

+38
-8
lines changed

Diff for: Jenkinsfile

+14-8
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
anyOf {
1824
branch 'main'
@@ -32,7 +38,7 @@ pipeline {
3238
steps {
3339
script {
3440
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
35-
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') {
41+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
3642
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3743
sh 'PROFILE=none ci/verify.sh'
3844
sh "ci/clean.sh"
@@ -50,7 +56,7 @@ pipeline {
5056
}
5157
}
5258
parallel {
53-
stage("test: baseline (jdk11)") {
59+
stage("test: baseline (next)") {
5460
agent {
5561
label 'data'
5662
}
@@ -64,7 +70,7 @@ pipeline {
6470
steps {
6571
script {
6672
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
67-
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') {
73+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
6874
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
6975
sh 'PROFILE=java11 ci/verify.sh'
7076
sh "ci/clean.sh"
@@ -74,7 +80,7 @@ pipeline {
7480
}
7581
}
7682

77-
stage("test: baseline (jdk17)") {
83+
stage("test: baseline (LTS)") {
7884
agent {
7985
label 'data'
8086
}
@@ -88,7 +94,7 @@ pipeline {
8894
steps {
8995
script {
9096
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
91-
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') {
97+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
9298
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
9399
sh 'PROFILE=java11 ci/verify.sh'
94100
sh "ci/clean.sh"
@@ -119,7 +125,7 @@ pipeline {
119125
steps {
120126
script {
121127
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
122-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
128+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
123129
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-elasticsearch-non-root ' +
124130
'-Dartifactory.server=https://repo.spring.io ' +
125131
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -149,7 +155,7 @@ pipeline {
149155
steps {
150156
script {
151157
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
152-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
158+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
153159
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
154160
'-Dartifactory.server=https://repo.spring.io ' +
155161
"-Dartifactory.username=${ARTIFACTORY_USR} " +

Diff for: 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)