@@ -3,7 +3,7 @@ pipeline {
33
44 triggers {
55 pollSCM ' H/10 * * * *'
6- upstream(upstreamProjects : " spring-data-keyvalue/main " , threshold : hudson.model.Result . SUCCESS )
6+ upstream(upstreamProjects : " spring-data-keyvalue/3.0.x " , threshold : hudson.model.Result . SUCCESS )
77 }
88
99 options {
@@ -17,7 +17,7 @@ pipeline {
1717 stage(' Publish JDK 17 + Redis 6.2 Docker image' ) {
1818 when {
1919 anyOf {
20- changeset " ci/openjdk17-redis6 .2/**"
20+ changeset " ci/openjdk17-redis-6 .2/**"
2121 changeset " Makefile"
2222 }
2323 }
@@ -26,7 +26,7 @@ pipeline {
2626
2727 steps {
2828 script {
29- def image = docker. build(" springci/spring-data-openjdk17-with-redis-6.2" , " -f ci/openjdk17-redis6 .2/Dockerfile ." )
29+ def image = docker. build(" springci/spring-data-openjdk17-with-redis-6.2" , " -f ci/openjdk17-redis-6 .2/Dockerfile ." )
3030 docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
3131 image. push()
3232 }
@@ -38,8 +38,9 @@ pipeline {
3838
3939 stage(" test: baseline (Java 17)" ) {
4040 when {
41+ beforeAgent(true )
4142 anyOf {
42- branch ' main'
43+ branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
4344 not { triggeredBy ' UpstreamCause' }
4445 }
4546 }
@@ -63,8 +64,9 @@ pipeline {
6364
6465 stage(' Release to artifactory' ) {
6566 when {
67+ beforeAgent(true )
6668 anyOf {
67- branch ' main'
69+ branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
6870 not { triggeredBy ' UpstreamCause' }
6971 }
7072 }
@@ -94,35 +96,6 @@ pipeline {
9496 }
9597 }
9698 }
97-
98- stage(' Publish documentation' ) {
99- when {
100- branch ' main'
101- }
102- agent {
103- label ' data'
104- }
105- options { timeout(time : 20 , unit : ' MINUTES' ) }
106-
107- environment {
108- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
109- }
110-
111- steps {
112- script {
113- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
114- docker. image(' openjdk:17-bullseye' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
115- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
116- ' -Dartifactory.server=https://repo.spring.io ' +
117- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
118- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
119- " -Dartifactory.distribution-repository=temp-private-local " +
120- ' -Dmaven.test.skip=true clean deploy -U -B'
121- }
122- }
123- }
124- }
125- }
12699 }
127100
128101 post {
0 commit comments