From 719a1f15f07c80ebdd40419e5deea195f802ed85 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 24 Nov 2023 09:51:28 +0100 Subject: [PATCH] Introduce property for Jenkins user and Artifactory server details. Closes #3240 --- Jenkinsfile | 9 ++++----- ci/pipeline.properties | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 39ecab900..5be55872e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -141,19 +141,18 @@ pipeline { label 'data' } options { timeout(time: 20, unit: 'MINUTES') } - environment { ARTIFACTORY = credentials("${p['artifactory.credentials']}") } - steps { script { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' + - '-Dartifactory.server=https://repo.spring.io ' + + sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' + + "./mvnw -s settings.xml -Pci,artifactory " + + "-Dartifactory.server=${p['artifactory.url']} " + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=libs-snapshot-local " + + "-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " + "-Dartifactory.build-name=spring-data-jpa " + "-Dartifactory.build-number=${BUILD_NUMBER} " + '-Dmaven.test.skip=true clean deploy -U -B' diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 3f58111a7..b83cae835 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -16,12 +16,13 @@ docker.redis.6.version=6.2.13 # Supported versions of Cassandra docker.cassandra.3.version=3.11.16 - # Docker environment settings docker.java.inside.basic=-v $HOME:/tmp/jenkins-home 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 - # Credentials docker.registry= docker.credentials=hub.docker.com-springbuildmaster artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c +artifactory.url=https://repo.spring.io +artifactory.repository.snapshot=libs-snapshot-local +jenkins.user.name=spring-builds+jenkins