diff --git a/Jenkinsfile b/Jenkinsfile index 7ed6a636..631a70a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,11 +31,11 @@ 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.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`' sh 'rm -Rf `find . -name "ConfigDiskDir*"`' @@ -65,11 +65,11 @@ 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.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) { sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`' sh 'rm -Rf `find . -name "ConfigDiskDir*"`' @@ -90,11 +90,11 @@ 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.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) { sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`' sh 'rm -Rf `find . -name "ConfigDiskDir*"`' @@ -125,12 +125,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 'rm -Rf `find . -name "BACKUPDEFAULT*"`' sh 'rm -Rf `find . -name "ConfigDiskDir*"`' diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 5d91102d..9d382ca6 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -22,3 +22,8 @@ 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 +artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c