@@ -43,6 +43,7 @@ stage('Configure') {
43
43
// buildEnv('8', 'mssql'),
44
44
// buildEnv('8', 'sybase'),
45
45
buildEnv(' 8' , ' hana' , ' HANA' ),
46
+ buildEnv(' 8' , ' s390x' , ' s390x' ),
46
47
// Disable EDB for now as the image is not available anymore
47
48
// buildEnv('8', 'edb')
48
49
];
@@ -148,56 +149,38 @@ stage('Build') {
148
149
}
149
150
}
150
151
stage(' Test' ) {
151
- // Clean by default otherwise the PackagedEntityManager tests fail on a node that previously ran a different DB
152
- boolean clean = true ;
153
- String goal;
154
- String lockableResource;
155
152
switch (buildEnv. dbName) {
156
153
case " h2" :
157
154
case " derby" :
158
155
case " hsqldb" :
159
- goal = " -Pdb=${ buildEnv.dbName} "
156
+ runTest( " -Pdb=${ buildEnv.dbName} " )
160
157
break ;
161
158
case " mysql8" :
162
- goal = " -Pdb=mysql_ci"
159
+ runTest( " -Pdb=mysql_ci" )
163
160
break ;
164
161
case " postgresql_9_5" :
165
162
case " postgresql_13" :
166
- goal = " -Pdb=pgsql_ci"
163
+ runTest( " -Pdb=pgsql_ci" )
167
164
break ;
168
165
case " oracle" :
169
- goal = " -Pdb=oracle_ci -PexcludeTests=**.LockTest.testQueryTimeout*"
166
+ runTest( " -Pdb=oracle_ci -PexcludeTests=**.LockTest.testQueryTimeout*" )
170
167
break ;
171
168
case " oracle_ee" :
172
- goal = " -Pdb=oracle_jenkins"
173
- lockableResource = ' ORACLE_RDS'
169
+ runTest(" -Pdb=oracle_jenkins" , ' ORACLE_RDS' )
174
170
break ;
175
171
case " hana" :
176
- // For HANA we have to also clean because this is a shared VM and the compile cache can become a problem
177
- clean = true ;
178
- goal = " -Pdb=hana_jenkins"
172
+ runTest(" -Pdb=hana_jenkins" , ' HANA' )
179
173
break ;
180
174
case " edb" :
181
- goal = " -Pdb=edb_ci -DdbHost=localhost:5433"
175
+ runTest(" -Pdb=edb_ci -DdbHost=localhost:5433" )
176
+ break ;
177
+ case " s390x" :
178
+ runTest(" -Pdb=h2" )
182
179
break ;
183
180
default :
184
- goal = " -Pdb=${ buildEnv.dbName} _ci"
181
+ runTest( " -Pdb=${ buildEnv.dbName} _ci" )
185
182
break ;
186
183
}
187
- String cmd = " ./gradlew" + (clean ? " clean" : " " ) + " check ${ goal} -Plog-test-progress=true --stacktrace" ;
188
- try {
189
- if (lockableResource == null ) {
190
- sh cmd
191
- }
192
- else {
193
- lock(lockableResource) {
194
- sh cmd
195
- }
196
- }
197
- }
198
- finally {
199
- junit ' **/target/test-results/test/*.xml'
200
- }
201
184
}
202
185
}
203
186
finally {
@@ -270,10 +253,27 @@ void runBuildOnNode(String label, Closure body) {
270
253
}
271
254
}
272
255
void pruneDockerContainers () {
273
- if ( ! sh( script : ' which docker' , returnStdout : true ). trim(). isEmpty() ) {
256
+ if ( ! sh( script : ' command -v docker || true ' , returnStdout : true ). trim(). isEmpty() ) {
274
257
sh ' docker container prune -f || true'
275
258
sh ' docker image prune -f || true'
276
259
sh ' docker network prune -f || true'
277
260
sh ' docker volume prune -f || true'
278
261
}
262
+ }
263
+ // Clean by default otherwise the PackagedEntityManager tests fail on a node that previously ran a different DB
264
+ void runTest (String goal , String lockableResource = null , boolean clean = true ) {
265
+ String cmd = " ./gradlew" + (clean ? " clean" : " " ) + " check ${ goal} -Plog-test-progress=true --stacktrace" ;
266
+ try {
267
+ if (lockableResource == null ) {
268
+ sh cmd
269
+ }
270
+ else {
271
+ lock(lockableResource) {
272
+ sh cmd
273
+ }
274
+ }
275
+ }
276
+ finally {
277
+ junit ' **/target/test-results/test/*.xml'
278
+ }
279
279
}
0 commit comments