File tree Expand file tree Collapse file tree 4 files changed +50
-4
lines changed Expand file tree Collapse file tree 4 files changed +50
-4
lines changed Original file line number Diff line number Diff line change 11def  p =  [:]
22node {
3-   checkout scm
4-   p =  readProperties interpolate : true , file : ' ci/pipeline.properties' 
3+  checkout scm
4+  p =  readProperties interpolate : true , file : ' ci/pipeline.properties' 
55}
66
77pipeline {
@@ -18,7 +18,7 @@ pipeline {
1818}
1919
2020stages {
21- stage(" test: baseline (Java 17 )"  ) {
21+ stage(" test: baseline (main )"  ) {
2222when {
2323beforeAgent(true )
2424anyOf {
@@ -39,14 +39,42 @@ pipeline {
3939steps {
4040script {
4141docker. image(p[' docker.java.main.image'  ]). inside(p[' docker.java.inside.docker'  ]) {
42- sh " docker login --username ${ DOCKER_HUB_USR}   --password ${ DOCKER_HUB_PSW} " 
4342sh " PROFILE=ci,all-dbs ci/test.sh" 
4443sh " ci/clean.sh" 
4544}
4645}
4746}
4847}
4948
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+ 
5078stage(' Release to artifactory'  ) {
5179when {
5280beforeAgent(true )
Original file line number Diff line number Diff line change 163163<artifactId >assertj-core</artifactId >
164164<version >${assertj} </version >
165165<scope >test</scope >
166+ <exclusions >
167+ <exclusion >
168+ <groupId >net.bytebuddy</groupId >
169+ <artifactId >byte-buddy</artifactId >
170+ </exclusion >
171+ </exclusions >
166172</dependency >
167173
168174<dependency >
Original file line number Diff line number Diff line change 168168<artifactId >assertj-core</artifactId >
169169<version >${assertj} </version >
170170<scope >test</scope >
171+ <exclusions >
172+ <exclusion >
173+ <groupId >net.bytebuddy</groupId >
174+ <artifactId >byte-buddy</artifactId >
175+ </exclusion >
176+ </exclusions >
171177</dependency >
172178
173179<dependency >
Original file line number Diff line number Diff line change 6262<artifactId >assertj-core</artifactId >
6363<version >${assertj} </version >
6464<scope >test</scope >
65+ <exclusions >
66+ <exclusion >
67+ <groupId >net.bytebuddy</groupId >
68+ <artifactId >byte-buddy</artifactId >
69+ </exclusion >
70+ </exclusions >
6571</dependency >
6672
6773<dependency >
                                 You can’t perform that action at this time. 
               
                  
0 commit comments