@@ -46,16 +46,16 @@ pipeline {
46
46
}
47
47
}
48
48
}
49
- stage(' Publish JDK 16 + Cassandra 3.11' ) {
49
+ stage(' Publish JDK 17 + Cassandra 3.11' ) {
50
50
when {
51
- changeset " ci/openjdk16 -8-cassandra-3.11/**"
51
+ changeset " ci/openjdk17 -8-cassandra-3.11/**"
52
52
}
53
53
agent { label ' data' }
54
54
options { timeout(time : 30 , unit : ' MINUTES' ) }
55
55
56
56
steps {
57
57
script {
58
- def image = docker. build(" springci/spring-data-openjdk16 -8-cassandra-3.11" , " ci/openjdk16-8-cassandra-3.11/" )
58
+ def image = docker. build(" springci/spring-data-openjdk17 -8-cassandra-3.11" , " ci/openjdk16-8-cassandra-3.11/" )
59
59
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
60
60
image. push()
61
61
}
@@ -67,8 +67,9 @@ pipeline {
67
67
68
68
stage(" test: baseline (jdk8)" ) {
69
69
when {
70
+ beforeAgent(true )
70
71
anyOf {
71
- branch ' main'
72
+ branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
72
73
not { triggeredBy ' UpstreamCause' }
73
74
}
74
75
}
@@ -94,8 +95,9 @@ pipeline {
94
95
95
96
stage(" Test other configurations" ) {
96
97
when {
98
+ beforeAgent(true )
97
99
allOf {
98
- branch ' main'
100
+ branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
99
101
not { triggeredBy ' UpstreamCause' }
100
102
}
101
103
}
@@ -120,7 +122,7 @@ pipeline {
120
122
}
121
123
}
122
124
}
123
- stage(" test: baseline (jdk16 )" ) {
125
+ stage(" test: baseline (jdk17 )" ) {
124
126
agent {
125
127
label ' data'
126
128
}
@@ -131,7 +133,7 @@ pipeline {
131
133
steps {
132
134
script {
133
135
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
134
- docker. image(' springci/spring-data-openjdk16 -8-cassandra-3.11:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
136
+ docker. image(' springci/spring-data-openjdk17 -8-cassandra-3.11:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
135
137
sh ' mkdir -p /tmp/jenkins-home'
136
138
sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
137
139
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'
@@ -144,8 +146,9 @@ pipeline {
144
146
}
145
147
stage(' Release to artifactory' ) {
146
148
when {
149
+ beforeAgent(true )
147
150
anyOf {
148
- branch ' main'
151
+ branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
149
152
not { triggeredBy ' UpstreamCause' }
150
153
}
151
154
}
@@ -176,35 +179,6 @@ pipeline {
176
179
}
177
180
}
178
181
}
179
- stage(' Publish documentation' ) {
180
- when {
181
- branch ' main'
182
- }
183
- agent {
184
- label ' data'
185
- }
186
- options { timeout(time : 20 , unit : ' MINUTES' ) }
187
-
188
- environment {
189
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
190
- }
191
-
192
- steps {
193
- script {
194
- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
195
- docker. image(' adoptopenjdk/openjdk8:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
196
- sh ' mkdir -p /tmp/jenkins-home'
197
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
198
- ' -Dartifactory.server=https://repo.spring.io ' +
199
- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
200
- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
201
- " -Dartifactory.distribution-repository=temp-private-local " +
202
- ' -Dmaven.test.skip=true clean deploy -U -B'
203
- }
204
- }
205
- }
206
- }
207
- }
208
182
}
209
183
210
184
post {
0 commit comments