File tree 2 files changed +10
-11
lines changed
2 files changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ pipeline {
18
18
}
19
19
20
20
stages {
21
- stage(" test: baseline (jdk17 )" ) {
21
+ stage(" test: baseline (Java 17 )" ) {
22
22
when {
23
23
beforeAgent(true )
24
24
anyOf {
@@ -31,12 +31,12 @@ pipeline {
31
31
}
32
32
options { timeout(time : 30 , unit : ' MINUTES' ) }
33
33
environment {
34
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
34
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
35
35
ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
36
36
}
37
37
steps {
38
38
script {
39
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
39
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
40
40
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
41
41
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
42
42
sh ' PROFILE=all-dbs ci/test.sh'
@@ -66,7 +66,7 @@ pipeline {
66
66
67
67
steps {
68
68
script {
69
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
69
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
70
70
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
71
71
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
72
72
' -Dartifactory.server=https://repo.spring.io ' +
Original file line number Diff line number Diff line change 1
1
# Java versions
2
- java.main.tag =8u312-b07-jdk
3
- java.next.tag =11.0.13_8-jdk
4
- java.lts.tag =17.0.1_12-jdk
2
+ java.main.tag =17.0.2_8-jdk
5
3
6
4
# Docker container images - standard
7
5
docker.java.main.image =eclipse-temurin:${java.main.tag}
8
- docker.java.next.image =eclipse-temurin:${java.next.tag}
9
- docker.java.lts.image =eclipse-temurin:${java.lts.tag}
10
6
11
7
# Supported versions of MongoDB
12
- docker.mongodb.4.0.version =4.0.23
13
8
docker.mongodb.4.4.version =4.4.4
14
9
docker.mongodb.5.0.version =5.0.3
15
10
16
11
# Supported versions of Redis
17
12
docker.redis.6.version =6.2.4
18
13
19
14
# Supported versions of Cassandra
20
- docker.cassandra.3.version =3.11.10
15
+ docker.cassandra.3.version =3.11.11
21
16
22
17
# Docker environment settings
23
18
docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
24
19
docker.java.inside.docker =-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
20
+
21
+ # Credentials
22
+ docker.registry =
23
+ docker.credentials =hub.docker.com-springbuildmaster
You can’t perform that action at this time.
0 commit comments