@@ -18,32 +18,7 @@ pipeline {
1818 }
1919
2020 stages {
21- stage(" Docker images" ) {
22- parallel {
23- stage(' Publish JDK 17 + Redis 6.2 Docker image' ) {
24- when {
25- anyOf {
26- changeset " ci/openjdk17-redis-6.2/Dockerfile"
27- changeset " Makefile"
28- changeset " ci/pipeline.properties"
29- }
30- }
31- agent { label ' data' }
32- options { timeout(time : 20 , unit : ' MINUTES' ) }
33-
34- steps {
35- script {
36- def image = docker. build(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg REDIS=${ p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile ." )
37- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
38- image. push()
39- }
40- }
41- }
42- }
43- }
44- }
45-
46- stage(" test: baseline (Java 17)" ) {
21+ stage(" test: baseline (main)" ) {
4722 when {
4823 beforeAgent(true )
4924 anyOf {
@@ -67,27 +42,47 @@ pipeline {
6742 }
6843 }
6944
70- stage(" test: native-hints " ) {
45+ stage(" Test other configurations " ) {
7146 when {
7247 beforeAgent(true )
7348 anyOf {
7449 branch(pattern : " main|(\\ d\\ .\\ d\\ .x)" , comparator : " REGEXP" )
7550 not { triggeredBy ' UpstreamCause' }
7651 }
7752 }
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- }
53+ parallel {
54+ stage(" test: native-hints" ) {
55+ agent {
56+ label ' data'
57+ }
58+ options { timeout(time : 30 , unit : ' MINUTES' ) }
59+ environment {
60+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
61+ }
62+ steps {
63+ script {
64+ 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' ) {
65+ sh ' PROFILE=runtimehints LONG_TESTS=false ci/test.sh'
66+ }
67+ }
68+ }
69+ }
70+ stage(" test: baseline (next)" ) {
71+ agent {
72+ label ' data'
73+ }
74+ options { timeout(time : 30 , unit : ' MINUTES' ) }
75+ environment {
76+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
77+ }
78+ steps {
79+ script {
80+ 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' ) {
81+ sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
82+ }
83+ }
84+ }
85+ }
9186 }
9287 }
9388
0 commit comments