From 426f3506566a8fb44c2d91be140abaad326cf9d6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 4 Feb 2022 09:50:48 +0100 Subject: [PATCH] Polishing. Extract artifactory credentials. See #1629 --- Jenkinsfile | 8 ++++---- ci/pipeline.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72dabfae..e3620345 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -48,7 +48,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -67,7 +67,7 @@ pipeline { } options { timeout(time: 30, unit: 'MINUTES') } environment { - ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') + ARTIFACTORY = credentials("${p['artifactory.credentials']}") } steps { script { @@ -89,7 +89,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 5d3ef18f..9d382ca6 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -23,7 +23,7 @@ docker.cassandra.3.version=3.11.10 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