Skip to content

Commit 8125a3f

Browse files
gregturngregturn
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 07f3a91 commit 8125a3f

File tree

5 files changed

+55
-15
lines changed

5 files changed

+55
-15
lines changed

‎Jenkinsfile

+21-9
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

@@ -16,14 +22,17 @@ pipeline {
1622
parallel {
1723
stage('Publish JDK 8 + 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:jdk8", "--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
}
@@ -32,14 +41,17 @@ pipeline {
3241
}
3342
stage('Publish JDK 11 + 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:jdk11", "--build-arg BASE=${p['docker.java.next.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
}
@@ -55,7 +67,7 @@ pipeline {
5567

5668
steps {
5769
script {
58-
def image = docker.build("springci/spring-data-openjdk17-8-cassandra-3.11", "ci/openjdk17-8-cassandra-3.11/")
70+
def image = docker.build("springci/spring-data-with-cassandra-3.11:jdk17", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/")
5971
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6072
image.push()
6173
}
@@ -83,7 +95,7 @@ pipeline {
8395
steps {
8496
script {
8597
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
86-
docker.image('springci/spring-data-openjdk8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
98+
docker.image("springci/spring-data-with-cassandra-3.11:jdk8").inside(p['docker.java.inside.basic']) {
8799
sh 'mkdir -p /tmp/jenkins-home'
88100
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
89101
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'
@@ -113,7 +125,7 @@ pipeline {
113125
steps {
114126
script {
115127
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
116-
docker.image('springci/spring-data-openjdk11-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
128+
docker.image("springci/spring-data-with-cassandra-3.11:jdk11").inside(p['docker.java.inside.basic']) {
117129
sh 'mkdir -p /tmp/jenkins-home'
118130
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
119131
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'
@@ -133,7 +145,7 @@ pipeline {
133145
steps {
134146
script {
135147
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
136-
docker.image('springci/spring-data-openjdk17-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
148+
docker.image("springci/spring-data-with-cassandra-3.11:jdk17").inside(p['docker.java.inside.basic']) {
137149
sh 'mkdir -p /tmp/jenkins-home'
138150
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
139151
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'
@@ -164,7 +176,7 @@ pipeline {
164176
steps {
165177
script {
166178
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
167-
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']) {
168180
sh 'mkdir -p /tmp/jenkins-home'
169181
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
170182
'-Dartifactory.server=https://repo.spring.io ' +

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
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://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
58
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
69
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
710
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
FROM openjdk:17-bullseye
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://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
58
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
69
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
710
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \

‎ci/openjdk8-cassandra-3.11/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
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://archive.apache.org/dist/cassandra/3.11.10/apache-cassandra-3.11.10-bin.tar.gz'; \
7+
CASSANDRA_URL="https://archive.apache.org/dist/cassandra/${CASSANDRA}/apache-cassandra-${CASSANDRA}-bin.tar.gz"; \
58
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
69
curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
710
mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \

‎ci/pipeline.properties

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Docker container images - standard
2+
docker.java.main.image=adoptopenjdk/openjdk8:latest
3+
docker.java.next.image=adoptopenjdk/openjdk11:latest
4+
docker.java.lts.image=openjdk:17-bullseye
5+
6+
# Supported versions of MongoDB
7+
docker.mongodb.4.0.version=4.0.23
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.10
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)