From 156f904a16afc6336e8f111aca757fb2042baba3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Thu, 3 Feb 2022 11:47:51 +0100
Subject: [PATCH] Polishing.

Extract docker credentials into properties file.

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 8254839..0540963 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
 			}
 			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 clean dependency:list test -Dsort -U -B'
 						}
@@ -51,7 +51,7 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline (next)") {
+				stage("test: baseline (jdk11)") {
 					agent {
 						label 'data'
 					}
@@ -61,8 +61,8 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
 									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
 								}
 							}
@@ -80,7 +80,7 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
 									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
 								}
@@ -109,7 +109,7 @@ pipeline {
 
 			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 ' +
@@ -139,7 +139,7 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 5d91102..232bed5 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,12 +1,12 @@
 # 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.11.tag=11.0.13_8-jdk
+java.15.tag=15.0.2_7-jdk-hotspot
 
 # 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}
+docker.java.11.image=eclipse-temurin:${java.11.tag}
+docker.java.15.image=adoptopenjdk:${java.15.tag}
 
 # Supported versions of MongoDB
 docker.mongodb.4.0.version=4.0.23
@@ -22,3 +22,7 @@ docker.cassandra.3.version=3.11.10
 # 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