1
+ def p = [:]
2
+ node {
3
+ checkout scm
4
+ p = readProperties interpolate : true , file : ' ci/pipeline.properties'
5
+ }
6
+
1
7
pipeline {
2
8
agent none
3
9
@@ -17,16 +23,17 @@ pipeline {
17
23
stage(' Publish JDK 17 + Redis 6.2 Docker image' ) {
18
24
when {
19
25
anyOf {
20
- changeset " ci/openjdk17-redis-6.2/** "
26
+ changeset " ci/openjdk17-redis-6.2/Dockerfile "
21
27
changeset " Makefile"
28
+ changeset " ci/pipeline.properties"
22
29
}
23
30
}
24
31
agent { label ' data' }
25
32
options { timeout(time : 20 , unit : ' MINUTES' ) }
26
33
27
34
steps {
28
35
script {
29
- def image = docker. build(" springci/spring-data-openjdk17- with-redis-6.2" , " -f ci/openjdk17-redis-6.2/Dockerfile ." )
36
+ def image = docker. build(" springci/spring-data-with-redis-6.2: ${ p['java.main.tag'] } " , " --build-arg BASE= ${ p['docker.java.main.image'] } --build-arg REDIS= ${ p['docker.redis.6.version'] } -f ci/openjdk17-redis-6.2/Dockerfile ." )
30
37
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
31
38
image. push()
32
39
}
@@ -54,7 +61,7 @@ pipeline {
54
61
steps {
55
62
script {
56
63
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
57
- docker. image(' springci/spring-data-openjdk17-with-redis-6.2:latest ' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
64
+ docker. image(' springci/spring-data-openjdk17-with-redis-6.2:${p[ ' java . main . tag ' ]} ' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
58
65
sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
59
66
}
60
67
}
@@ -82,7 +89,7 @@ pipeline {
82
89
steps {
83
90
script {
84
91
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
85
- docker. image(' openjdk:17-bullseye ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
92
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
86
93
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
87
94
' -Dartifactory.server=https://repo.spring.io ' +
88
95
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments