File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -141,19 +141,18 @@ pipeline {
141
141
label ' data'
142
142
}
143
143
options { timeout(time : 20 , unit : ' MINUTES' ) }
144
-
145
144
environment {
146
145
ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
147
146
}
148
-
149
147
steps {
150
148
script {
151
149
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
152
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
153
- ' -Dartifactory.server=https://repo.spring.io ' +
150
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
151
+ " ./mvnw -s settings.xml -Pci,artifactory " +
152
+ " -Dartifactory.server=${ p['artifactory.url']} " +
154
153
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
155
154
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
156
- " -Dartifactory.staging-repository=libs- snapshot-local " +
155
+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
157
156
" -Dartifactory.build-name=spring-data-jpa " +
158
157
" -Dartifactory.build-number=${ BUILD_NUMBER} " +
159
158
' -Dmaven.test.skip=true clean deploy -U -B'
Original file line number Diff line number Diff line change @@ -16,12 +16,13 @@ docker.redis.6.version=6.2.13
16
16
17
17
# Supported versions of Cassandra
18
18
docker.cassandra.3.version =3.11.16
19
-
20
19
# Docker environment settings
21
20
docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
22
21
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
23
-
24
22
# Credentials
25
23
docker.registry =
26
24
docker.credentials =hub.docker.com-springbuildmaster
27
25
artifactory.credentials =02bd1690-b54f-4c9f-819d-a77cb7a9822c
26
+ artifactory.url =https://repo.spring.io
27
+ artifactory.repository.snapshot =libs-snapshot-local
28
+ jenkins.user.name =spring-builds+jenkins
You can’t perform that action at this time.
0 commit comments