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 {
141141 label ' data'
142142 }
143143 options { timeout(time : 20 , unit : ' MINUTES' ) }
144-
145144 environment {
146145 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
147146 }
148-
149147 steps {
150148 script {
151149 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']} " +
154153 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
155154 " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
156- " -Dartifactory.staging-repository=libs- snapshot-local " +
155+ " -Dartifactory.staging-repository=${ p['artifactory.repository. snapshot'] } " +
157156 " -Dartifactory.build-name=spring-data-jpa " +
158157 " -Dartifactory.build-number=${ BUILD_NUMBER} " +
159158 ' -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
1616
1717# Supported versions of Cassandra
1818docker.cassandra.3.version =3.11.16
19-
2019# Docker environment settings
2120docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
2221docker.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-
2422# Credentials
2523docker.registry =
2624docker.credentials =hub.docker.com-springbuildmaster
2725artifactory.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