From b485106de456585fbffb7da640a862b84c6ca9a7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 4 Feb 2022 14:49:25 +0100
Subject: [PATCH] Polishing.

Extract docker and artifactory credentials into property file.

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 8288926d..67b06b05 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,17 +32,13 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }
 
 			environment {
-				DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				DOCKER_HUB = credentials("${p['docker.credentials']}")
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh "PROFILE=ci,all-dbs ci/test.sh"
-							sh "ci/clean.sh"
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
 							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
 							sh "PROFILE=ci,all-dbs ci/test.sh"
@@ -67,12 +63,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 -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
 								'-Dartifactory.server=https://repo.spring.io ' +
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 5d91102d..02d37830 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