@@ -14,10 +14,10 @@ pipeline {
14
14
stages {
15
15
stage(" Docker images" ) {
16
16
parallel {
17
- stage(' Publish OpenJDK 8 + Redis 6.2 docker image' ) {
17
+ stage(' Publish JDK 17 + Redis 6.2 Docker image' ) {
18
18
when {
19
19
anyOf {
20
- changeset " ci/openjdk8-redis-6 .2/**"
20
+ changeset " ci/openjdk17-redis6 .2/**"
21
21
changeset " Makefile"
22
22
}
23
23
}
@@ -26,26 +26,7 @@ pipeline {
26
26
27
27
steps {
28
28
script {
29
- def image = docker. build(" springci/spring-data-openjdk8-with-redis-6.2" , " -f ci/openjdk8-redis-6.2/Dockerfile ." )
30
- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
31
- image. push()
32
- }
33
- }
34
- }
35
- }
36
- stage(' Publish OpenJDK 17 + Redis 6.2 docker image' ) {
37
- when {
38
- anyOf {
39
- changeset " ci/openjdk16-redis-6.2/**"
40
- changeset " Makefile"
41
- }
42
- }
43
- agent { label ' data' }
44
- options { timeout(time : 20 , unit : ' MINUTES' ) }
45
-
46
- steps {
47
- script {
48
- def image = docker. build(" springci/spring-data-openjdk17-with-redis-6.2" , " -f ci/openjdk17-redis-6.2/Dockerfile ." )
29
+ def image = docker. build(" springci/spring-data-openjdk17-with-redis-6.2" , " -f ci/openjdk17-redis6.2/Dockerfile ." )
49
30
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
50
31
image. push()
51
32
}
@@ -55,11 +36,10 @@ pipeline {
55
36
}
56
37
}
57
38
58
- stage(" test: baseline (jdk8 )" ) {
39
+ stage(" test: baseline (Java 17 )" ) {
59
40
when {
60
- beforeAgent(true )
61
41
anyOf {
62
- branch( pattern : " main|( \\ d \\ . \\ d \\ .x) " , comparator : " REGEXP " )
42
+ branch ' main'
63
43
not { triggeredBy ' UpstreamCause' }
64
44
}
65
45
}
@@ -73,51 +53,51 @@ pipeline {
73
53
steps {
74
54
script {
75
55
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
76
- docker. image(' springci/spring-data-openjdk8 -with-redis-6.2:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
56
+ docker. image(' springci/spring-data-openjdk17 -with-redis-6.2:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
77
57
sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
78
58
}
79
59
}
80
60
}
81
61
}
82
62
}
83
63
84
- stage(" Test other configurations " ) {
64
+ stage(' Release to artifactory ' ) {
85
65
when {
86
- beforeAgent(true )
87
- allOf {
88
- branch(pattern : " main|(\\ d\\ .\\ d\\ .x)" , comparator : " REGEXP" )
66
+ anyOf {
67
+ branch ' main'
89
68
not { triggeredBy ' UpstreamCause' }
90
69
}
91
70
}
92
- parallel {
93
- stage(" test: baseline (jdk17)" ) {
94
- agent {
95
- label ' data'
96
- }
97
- options { timeout(time : 30 , unit : ' MINUTES' ) }
98
- environment {
99
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
100
- }
101
- steps {
102
- script {
103
- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
104
- docker. image(' springci/spring-data-openjdk17-with-redis-6.2:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
105
- sh ' PROFILE=java11 ci/test.sh'
106
- }
107
- }
71
+ agent {
72
+ label ' data'
73
+ }
74
+ options { timeout(time : 20 , unit : ' MINUTES' ) }
75
+
76
+ environment {
77
+ ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
78
+ }
79
+
80
+ steps {
81
+ script {
82
+ docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
83
+ docker. image(' openjdk:17-bullseye' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
84
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
85
+ ' -Dartifactory.server=https://repo.spring.io ' +
86
+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
87
+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
88
+ " -Dartifactory.staging-repository=libs-snapshot-local " +
89
+ " -Dartifactory.build-name=spring-data-redis " +
90
+ " -Dartifactory.build-number=${ BUILD_NUMBER} " +
91
+ ' -Dmaven.test.skip=true clean deploy -U -B'
108
92
}
109
93
}
110
94
}
111
95
}
112
96
}
113
97
114
- stage(' Release to artifactory ' ) {
98
+ stage(' Publish documentation ' ) {
115
99
when {
116
- beforeAgent(true )
117
- anyOf {
118
- branch(pattern : " main|(\\ d\\ .\\ d\\ .x)" , comparator : " REGEXP" )
119
- not { triggeredBy ' UpstreamCause' }
120
- }
100
+ branch ' main'
121
101
}
122
102
agent {
123
103
label ' data'
@@ -131,14 +111,12 @@ pipeline {
131
111
steps {
132
112
script {
133
113
docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
134
- docker. image(' adoptopenjdk/openjdk8:latest ' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
135
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
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 ' +
136
116
' -Dartifactory.server=https://repo.spring.io ' +
137
117
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
138
118
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
139
- " -Dartifactory.staging-repository=libs-snapshot-local " +
140
- " -Dartifactory.build-name=spring-data-redis " +
141
- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
119
+ " -Dartifactory.distribution-repository=temp-private-local " +
142
120
' -Dmaven.test.skip=true clean deploy -U -B'
143
121
}
144
122
}
0 commit comments