Skip to content

Commit 5d1eba2

Browse files
committed
Introduce property for Jenkins user and Artifactory server details.
Closes #3240
1 parent 587573c commit 5d1eba2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Jenkinsfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,18 @@ pipeline {
123123
label 'data'
124124
}
125125
options { timeout(time: 20, unit: 'MINUTES') }
126-
127126
environment {
128127
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
129128
}
130-
131129
steps {
132130
script {
133131
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
134-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
135-
'-Dartifactory.server=https://repo.spring.io ' +
132+
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
133+
"./mvnw -s settings.xml -Pci,artifactory " +
134+
"-Dartifactory.server=${p['artifactory.url']} " +
136135
"-Dartifactory.username=${ARTIFACTORY_USR} " +
137136
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
138-
"-Dartifactory.staging-repository=libs-snapshot-local " +
137+
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
139138
"-Dartifactory.build-name=spring-data-jpa " +
140139
"-Dartifactory.build-number=${BUILD_NUMBER} " +
141140
'-Dmaven.test.skip=true clean deploy -U -B'

ci/pipeline.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ docker.redis.6.version=6.2.13
1616

1717
# Supported versions of Cassandra
1818
docker.cassandra.3.version=3.11.16
19-
2019
# Docker environment settings
2120
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2221
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-
2422
# Credentials
2523
docker.registry=
2624
docker.credentials=hub.docker.com-springbuildmaster
2725
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

0 commit comments

Comments
 (0)