From 5516847ac685f8d7c8d0b243ac7222132d16549b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 4 Feb 2022 10:00:57 +0100
Subject: [PATCH] Polishing.

Extract Artifactory and docker credentials into properties file.

See #2245
---
 Jenkinsfile            | 18 +++++++++---------
 ci/pipeline.properties | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81208284b..17a6d6811 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 def p = [:]
 node {
-    checkout scm
-    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+	checkout scm
+	p = readProperties interpolate: true, file: 'ci/pipeline.properties'
 }
 
 pipeline {
@@ -25,7 +25,7 @@ pipeline {
 						anyOf {
 							changeset "ci/openjdk17-redis-6.2/Dockerfile"
 							changeset "Makefile"
-						    changeset "ci/pipeline.properties"
+							changeset "ci/pipeline.properties"
 						}
 					}
 					agent { label 'data' }
@@ -34,7 +34,7 @@ pipeline {
 					steps {
 						script {
 							def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
 						}
@@ -56,12 +56,12 @@ pipeline {
 			}
 			options { timeout(time: 30, unit: 'MINUTES') }
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('springci/spring-data-openjdk17-with-redis-6.2:${p['java.main.tag']}').inside('-v $HOME:/tmp/jenkins-home') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+						docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
 							sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
 						}
 					}
@@ -83,12 +83,12 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 						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 ' +
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 5d91102d2..02d378303 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,15 +1,10 @@
 # Java versions
-java.main.tag=8u312-b07-jdk
-java.next.tag=11.0.13_8-jdk
-java.lts.tag=17.0.1_12-jdk
+java.main.tag=17.0.2_8-jdk
 
 # Docker container images - standard
 docker.java.main.image=eclipse-temurin:${java.main.tag}
-docker.java.next.image=eclipse-temurin:${java.next.tag}
-docker.java.lts.image=eclipse-temurin:${java.lts.tag}
 
 # Supported versions of MongoDB
-docker.mongodb.4.0.version=4.0.23
 docker.mongodb.4.4.version=4.4.4
 docker.mongodb.5.0.version=5.0.3
 
@@ -17,8 +12,13 @@ docker.mongodb.5.0.version=5.0.3
 docker.redis.6.version=6.2.4
 
 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.10
+docker.cassandra.3.version=3.11.11
 
 # 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