File tree 4 files changed +50
-4
lines changed 4 files changed +50
-4
lines changed Original file line number Diff line number Diff line change 1
1
def p = [:]
2
2
node {
3
- checkout scm
4
- p = readProperties interpolate : true , file : ' ci/pipeline.properties'
3
+ checkout scm
4
+ p = readProperties interpolate : true , file : ' ci/pipeline.properties'
5
5
}
6
6
7
7
pipeline {
@@ -18,7 +18,7 @@ pipeline {
18
18
}
19
19
20
20
stages {
21
- stage(" test: baseline (Java 17 )" ) {
21
+ stage(" test: baseline (main )" ) {
22
22
when {
23
23
beforeAgent(true )
24
24
anyOf {
@@ -39,14 +39,42 @@ pipeline {
39
39
steps {
40
40
script {
41
41
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
42
- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
43
42
sh " PROFILE=ci,all-dbs ci/test.sh"
44
43
sh " ci/clean.sh"
45
44
}
46
45
}
47
46
}
48
47
}
49
48
49
+ stage(" Test other configurations" ) {
50
+ when {
51
+ beforeAgent(true )
52
+ allOf {
53
+ branch(pattern : " main|(\\ d\\ .\\ d\\ .x)" , comparator : " REGEXP" )
54
+ not { triggeredBy ' UpstreamCause' }
55
+ }
56
+ }
57
+ parallel {
58
+ stage(" test: baseline (next)" ) {
59
+ agent {
60
+ label ' data'
61
+ }
62
+ options { timeout(time : 30 , unit : ' MINUTES' ) }
63
+ environment {
64
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
65
+ }
66
+ steps {
67
+ script {
68
+ docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
69
+ sh " PROFILE=ci,all-dbs ci/test.sh"
70
+ sh " ci/clean.sh"
71
+ }
72
+ }
73
+ }
74
+ }
75
+ }
76
+ }
77
+
50
78
stage(' Release to artifactory' ) {
51
79
when {
52
80
beforeAgent(true )
Original file line number Diff line number Diff line change 163
163
<artifactId >assertj-core</artifactId >
164
164
<version >${assertj} </version >
165
165
<scope >test</scope >
166
+ <exclusions >
167
+ <exclusion >
168
+ <groupId >net.bytebuddy</groupId >
169
+ <artifactId >byte-buddy</artifactId >
170
+ </exclusion >
171
+ </exclusions >
166
172
</dependency >
167
173
168
174
<dependency >
Original file line number Diff line number Diff line change 168
168
<artifactId >assertj-core</artifactId >
169
169
<version >${assertj} </version >
170
170
<scope >test</scope >
171
+ <exclusions >
172
+ <exclusion >
173
+ <groupId >net.bytebuddy</groupId >
174
+ <artifactId >byte-buddy</artifactId >
175
+ </exclusion >
176
+ </exclusions >
171
177
</dependency >
172
178
173
179
<dependency >
Original file line number Diff line number Diff line change 62
62
<artifactId >assertj-core</artifactId >
63
63
<version >${assertj} </version >
64
64
<scope >test</scope >
65
+ <exclusions >
66
+ <exclusion >
67
+ <groupId >net.bytebuddy</groupId >
68
+ <artifactId >byte-buddy</artifactId >
69
+ </exclusion >
70
+ </exclusions >
65
71
</dependency >
66
72
67
73
<dependency >
You can’t perform that action at this time.
0 commit comments