Polishing.

mp911de · mp911de · commit fd39108e978f · 2022-02-04T09:58:09.000+01:00
Extract artifactory credentials into properties file. See #2541
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,7 +30,7 @@ pipeline {
 			}
 			options { timeout(time: 30, unit: 'MINUTES') }
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 			steps {
 				script {
@@ -57,7 +57,7 @@ pipeline {
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 					steps {
 						script {
@@ -76,7 +76,7 @@ pipeline {
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 					steps {
 						script {
@@ -104,7 +104,7 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
@@ -134,7 +134,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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ pipeline {`
`30`	`30`	`}`
`31`	`31`	`options { timeout(time: 30, unit: 'MINUTES') }`
`32`	`32`	`environment {`
`33`		`- ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')`
	`33`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
`34`	`34`	`}`
`35`	`35`	`steps {`
`36`	`36`	`script {`
`@@ -57,7 +57,7 @@ pipeline {`
`57`	`57`	`}`
`58`	`58`	`options { timeout(time: 30, unit: 'MINUTES') }`
`59`	`59`	`environment {`
`60`		`- ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')`
	`60`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
`61`	`61`	`}`
`62`	`62`	`steps {`
`63`	`63`	`script {`
`@@ -76,7 +76,7 @@ pipeline {`
`76`	`76`	`}`
`77`	`77`	`options { timeout(time: 30, unit: 'MINUTES') }`
`78`	`78`	`environment {`
`79`		`- ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')`
	`79`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
`80`	`80`	`}`
`81`	`81`	`steps {`
`82`	`82`	`script {`
`@@ -104,7 +104,7 @@ pipeline {`
`104`	`104`	`options { timeout(time: 20, unit: 'MINUTES') }`
`105`	`105`
`106`	`106`	`environment {`
`107`		`- ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')`
	`107`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`steps {`
`@@ -134,7 +134,7 @@ pipeline {`
`134`	`134`	`options { timeout(time: 20, unit: 'MINUTES') }`
`135`	`135`
`136`	`136`	`environment {`
`137`		`- ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')`
	`137`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`steps {`