Skip to content

Commit d231409

Browse files
gregturngregturn
committed
DATAKV-333 - Use Docker hub credentials for all CI jobs.
1 parent 1f0b2e4 commit d231409

File tree

2 files changed

+57
-46
lines changed

2 files changed

+57
-46
lines changed

‎Jenkinsfile‎

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ pipeline {
2020
}
2121
}
2222
agent {
23-
docker {
24-
image 'adoptopenjdk/openjdk8:latest'
25-
label 'data'
26-
args '-v $HOME:/tmp/jenkins-home'
27-
}
23+
label 'data'
2824
}
2925
options { timeout(time: 30, unit: 'MINUTES') }
3026
steps {
31-
sh 'rm -rf ?'
32-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
27+
script {
28+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
29+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
30+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
31+
}
32+
}
33+
}
3334
}
3435
}
3536

@@ -43,31 +44,33 @@ pipeline {
4344
parallel {
4445
stage("test: baseline (jdk11)") {
4546
agent {
46-
docker {
47-
image 'adoptopenjdk/openjdk11:latest'
48-
label 'data'
49-
args '-v $HOME:/tmp/jenkins-home'
50-
}
47+
label 'data'
5148
}
5249
options { timeout(time: 30, unit: 'MINUTES') }
5350
steps {
54-
sh 'rm -rf ?'
55-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
51+
script {
52+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
53+
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
54+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
55+
}
56+
}
57+
}
5658
}
5759
}
5860

5961
stage("test: baseline (jdk15)") {
6062
agent {
61-
docker {
62-
image 'adoptopenjdk/openjdk15:latest'
63-
label 'data'
64-
args '-v $HOME:/tmp/jenkins-home'
65-
}
63+
label 'data'
6664
}
6765
options { timeout(time: 30, unit: 'MINUTES') }
6866
steps {
69-
sh 'rm -rf ?'
70-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
67+
script {
68+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69+
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
70+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
71+
}
72+
}
73+
}
7174
}
7275
}
7376
}
@@ -81,11 +84,7 @@ pipeline {
8184
}
8285
}
8386
agent {
84-
docker {
85-
image 'adoptopenjdk/openjdk8:latest'
86-
label 'data'
87-
args '-v $HOME:/tmp/jenkins-home'
88-
}
87+
label 'data'
8988
}
9089
options { timeout(time: 20, unit: 'MINUTES') }
9190

@@ -94,27 +93,28 @@ pipeline {
9493
}
9594

9695
steps {
97-
sh 'rm -rf ?'
98-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
99-
'-Dartifactory.server=https://repo.spring.io ' +
100-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
101-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
102-
"-Dartifactory.staging-repository=libs-snapshot-local " +
103-
"-Dartifactory.build-name=spring-data-keyvalue " +
104-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
105-
'-Dmaven.test.skip=true clean deploy -U -B'
96+
script {
97+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
98+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
99+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
100+
'-Dartifactory.server=https://repo.spring.io ' +
101+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
102+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
103+
"-Dartifactory.staging-repository=libs-snapshot-local " +
104+
"-Dartifactory.build-name=spring-data-keyvalue " +
105+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
106+
'-Dmaven.test.skip=true clean deploy -U -B'
107+
}
108+
}
109+
}
106110
}
107111
}
108112
stage('Publish documentation') {
109113
when {
110114
branch '2.4.x'
111115
}
112116
agent {
113-
docker {
114-
image 'adoptopenjdk/openjdk8:latest'
115-
label 'data'
116-
args '-v $HOME:/tmp/jenkins-home'
117-
}
117+
label 'data'
118118
}
119119
options { timeout(time: 20, unit: 'MINUTES') }
120120

@@ -123,12 +123,18 @@ pipeline {
123123
}
124124

125125
steps {
126-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
127-
'-Dartifactory.server=https://repo.spring.io ' +
128-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
129-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
130-
"-Dartifactory.distribution-repository=temp-private-local " +
131-
'-Dmaven.test.skip=true clean deploy -U -B'
126+
script {
127+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
128+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
129+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
130+
'-Dartifactory.server=https://repo.spring.io ' +
131+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
132+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
133+
"-Dartifactory.distribution-repository=temp-private-local " +
134+
'-Dmaven.test.skip=true clean deploy -U -B'
135+
}
136+
}
137+
}
132138
}
133139
}
134140
}

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@
100100
<id>spring-plugins-release</id>
101101
<url>https://repo.spring.io/plugins-release</url>
102102
</pluginRepository>
103+
<pluginRepository>
104+
<id>bintray-plugins</id>
105+
<name>bintray-plugins</name>
106+
<url>https://jcenter.bintray.com</url>
107+
</pluginRepository>
103108
</pluginRepositories>
104109

105110
</project>

0 commit comments

Comments
 (0)