@@ -18,9 +18,9 @@ pipeline {
18
18
}
19
19
20
20
stages {
21
- stage(" Docker images " ) {
21
+ stage(" Docker Images " ) {
22
22
parallel {
23
- stage(' Publish JDK 17 + Redis 6.2 Docker image ' ) {
23
+ stage(' Publish JDK 17 + Redis 6.2 Docker Image ' ) {
24
24
when {
25
25
anyOf {
26
26
changeset " ci/openjdk17-redis-6.2/Dockerfile"
@@ -40,6 +40,26 @@ pipeline {
40
40
}
41
41
}
42
42
}
43
+ stage(' Publish JDK 20 + Redis 6.2 Docker Image' ) {
44
+ when {
45
+ anyOf {
46
+ changeset " ci/openjdk20-redis-6.2/Dockerfile"
47
+ changeset " Makefile"
48
+ changeset " ci/pipeline.properties"
49
+ }
50
+ }
51
+ agent { label ' data' }
52
+ options { timeout(time : 20 , unit : ' MINUTES' ) }
53
+
54
+ steps {
55
+ script {
56
+ def image = docker. build(" springci/spring-data-with-redis-6.2:${ p['java.next.tag']} " , " --build-arg BASE=${ p['docker.java.next.image']} --build-arg REDIS=${ p['docker.redis.6.version']} -f ci/openjdk20-redis-6.2/Dockerfile ." )
57
+ docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
58
+ image. push()
59
+ }
60
+ }
61
+ }
62
+ }
43
63
}
44
64
}
45
65
@@ -67,27 +87,47 @@ pipeline {
67
87
}
68
88
}
69
89
70
- stage(" test: native-hints " ) {
90
+ stage(" Test other configurations " ) {
71
91
when {
72
92
beforeAgent(true )
73
93
anyOf {
74
94
branch(pattern : " main|(\\ d\\ .\\ d\\ .x)" , comparator : " REGEXP" )
75
95
not { triggeredBy ' UpstreamCause' }
76
96
}
77
97
}
78
- agent {
79
- label ' data'
80
- }
81
- options { timeout(time : 30 , unit : ' MINUTES' ) }
82
- environment {
83
- ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
84
- }
85
- steps {
86
- script {
87
- docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home' ) {
88
- sh ' PROFILE=runtimehints LONG_TESTS=false ci/test.sh'
89
- }
90
- }
98
+ parallel {
99
+ stage(" test: native-hints" ) {
100
+ agent {
101
+ label ' data'
102
+ }
103
+ options { timeout(time : 30 , unit : ' MINUTES' ) }
104
+ environment {
105
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
106
+ }
107
+ steps {
108
+ script {
109
+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home' ) {
110
+ sh ' PROFILE=runtimehints LONG_TESTS=false ci/test.sh'
111
+ }
112
+ }
113
+ }
114
+ }
115
+ stage(" test: baseline (Java 20)" ) {
116
+ agent {
117
+ label ' data'
118
+ }
119
+ options { timeout(time : 30 , unit : ' MINUTES' ) }
120
+ environment {
121
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
122
+ }
123
+ steps {
124
+ script {
125
+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.next.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home' ) {
126
+ sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
127
+ }
128
+ }
129
+ }
130
+ }
91
131
}
92
132
}
93
133
0 commit comments