Skip to content

Commit f2a1e52

Browse files
gregturnmp911de
gregturn
authored and
mp911de
committed
Externalize build properties.
By reading a properties file from an external location, it is possible to inject a consistent set of properties from Spring Data Build. This also supports repeatable builds. Closes #1214.
1 parent ea6f90c commit f2a1e52

File tree

5 files changed

+75
-20
lines changed

5 files changed

+75
-20
lines changed

‎Jenkinsfile

+29-14
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

@@ -14,32 +20,38 @@ pipeline {
1420
stages {
1521
stage("Docker images") {
1622
parallel {
17-
stage('Publish JDK 8 + Cassandra 3.11') {
23+
stage('Publish JDK (main) + Cassandra 3.11') {
1824
when {
19-
changeset "ci/openjdk8-cassandra-3.11/**"
25+
anyOf {
26+
changeset "ci/openjdk8-cassandra-3.11/**"
27+
changeset "ci/pipeline.properties"
28+
}
2029
}
2130
agent { label 'data' }
2231
options { timeout(time: 30, unit: 'MINUTES') }
2332

2433
steps {
2534
script {
26-
def image = docker.build("springci/spring-data-openjdk8-cassandra-3.11", "ci/openjdk8-cassandra-3.11/")
35+
def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk8-cassandra-3.11/")
2736
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
2837
image.push()
2938
}
3039
}
3140
}
3241
}
33-
stage('Publish JDK 11 + Cassandra 3.11') {
42+
stage('Publish JDK (next) + Cassandra 3.11') {
3443
when {
35-
changeset "ci/openjdk11-8-cassandra-3.11/**"
44+
anyOf {
45+
changeset "ci/openjdk11-8-cassandra-3.11/**"
46+
changeset "ci/pipeline.properties"
47+
}
3648
}
3749
agent { label 'data' }
3850
options { timeout(time: 30, unit: 'MINUTES') }
3951

4052
steps {
4153
script {
42-
def image = docker.build("springci/spring-data-openjdk11-8-cassandra-3.11", "ci/openjdk11-8-cassandra-3.11/")
54+
def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.11.tag']}", "--build-arg BASE=${p['docker.java.11.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk11-8-cassandra-3.11/")
4355
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
4456
image.push()
4557
}
@@ -48,14 +60,17 @@ pipeline {
4860
}
4961
stage('Publish JDK 15 + Cassandra 3.11') {
5062
when {
51-
changeset "ci/openjdk15-8-cassandra-3.11/**"
63+
anyOf {
64+
changeset "ci/openjdk15-8-cassandra-3.11/**"
65+
changeset "ci/pipeline.properties"
66+
}
5267
}
5368
agent { label 'data' }
5469
options { timeout(time: 30, unit: 'MINUTES') }
5570

5671
steps {
5772
script {
58-
def image = docker.build("springci/spring-data-openjdk15-8-cassandra-3.11", "ci/openjdk15-8-cassandra-3.11/")
73+
def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.15.tag']}", "--build-arg BASE=${p['docker.java.15.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/")
5974
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6075
image.push()
6176
}
@@ -65,7 +80,7 @@ pipeline {
6580
}
6681
}
6782

68-
stage("test: baseline (jdk8)") {
83+
stage("test: baseline (main)") {
6984
when {
7085
anyOf {
7186
branch '3.2.x'
@@ -82,7 +97,7 @@ pipeline {
8297
steps {
8398
script {
8499
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
85-
docker.image('springci/spring-data-openjdk8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
100+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
86101
sh 'mkdir -p /tmp/jenkins-home'
87102
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
88103
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
@@ -100,7 +115,7 @@ pipeline {
100115
}
101116
}
102117
parallel {
103-
stage("test: baseline (jdk11)") {
118+
stage("test: baseline (next)") {
104119
agent {
105120
label 'data'
106121
}
@@ -111,7 +126,7 @@ pipeline {
111126
steps {
112127
script {
113128
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
114-
docker.image('springci/spring-data-openjdk11-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
129+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
115130
sh 'mkdir -p /tmp/jenkins-home'
116131
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
117132
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
@@ -131,7 +146,7 @@ pipeline {
131146
steps {
132147
script {
133148
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
134-
docker.image('springci/spring-data-openjdk15-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
149+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.15.tag']}").inside(p['docker.java.inside.basic']) {
135150
sh 'mkdir -p /tmp/jenkins-home'
136151
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
137152
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
@@ -161,7 +176,7 @@ pipeline {
161176
steps {
162177
script {
163178
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
164-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
179+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
165180
sh 'mkdir -p /tmp/jenkins-home'
166181
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
167182
'-Dartifactory.server=https://repo.spring.io ' +

‎ci/openjdk11-8-cassandra-3.11/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
FROM adoptopenjdk/openjdk11:latest
1+
ARG BASE
2+
FROM ${BASE}
3+
# Any ARG statements before FROM are cleared.
4+
ARG CASSANDRA
25

36
RUN set -eux; \
4-
CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
8+
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
59
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
610
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
711
cd /opt/cassandra; \

‎ci/openjdk15-8-cassandra-3.11/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
FROM adoptopenjdk/openjdk15:latest
1+
ARG BASE
2+
FROM ${BASE}
3+
# Any ARG statements before FROM are cleared.
4+
ARG CASSANDRA
25

36
RUN set -eux; \
4-
CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
8+
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
59
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
610
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
711
cd /opt/cassandra; \

‎ci/openjdk8-cassandra-3.11/Dockerfile

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
FROM adoptopenjdk/openjdk8:latest
1+
ARG BASE
2+
FROM ${BASE}
3+
# Any ARG statements before FROM are cleared.
4+
ARG CASSANDRA
25

36
RUN set -eux; \
4-
CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
8+
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
59
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
610
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
711
cd /opt/cassandra; \

‎ci/pipeline.properties

+28
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)