From 1762eada06b07449fe20951e1d266567c97806c8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 4 Feb 2022 09:57:26 +0100 Subject: [PATCH] Polishing. Extract artifactory credentials into properties file. See #2541 --- Jenkinsfile | 8 ++++---- ci/pipeline.properties | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a16977b75..7d6b33e39b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -59,7 +59,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -78,7 +78,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -107,7 +107,7 @@ pipeline { options { timeout(time: 20, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 51b0767ccf..9d382ca66b 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -26,3 +26,4 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock - # Credentials docker.registry= docker.credentials=hub.docker.com-springbuildmaster +artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c