Skip to content

Commit b902ad5

Browse files
gregturngregturn
committed
#1309 - Use Docker hub credentials for all CI jobs.
1 parent 1c043db commit b902ad5

File tree

2 files changed

+54
-41
lines changed

2 files changed

+54
-41
lines changed

‎Jenkinsfile‎

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -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 verify -Dsort -B'
31+
}
32+
}
33+
}
3234
}
3335
}
3436

@@ -42,15 +44,17 @@ pipeline {
4244
}
4345
}
4446
agent {
45-
docker {
46-
image 'adoptopenjdk/openjdk11:latest'
47-
label 'data'
48-
args '-v $HOME:/tmp/jenkins-home'
49-
}
47+
label 'data'
5048
}
5149
options { timeout(time: 30, unit: 'MINUTES') }
5250
steps {
53-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -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 verify -Dsort -B'
55+
}
56+
}
57+
}
5458
}
5559
}
5660

@@ -62,15 +66,17 @@ pipeline {
6266
}
6367
}
6468
agent {
65-
docker {
66-
image 'adoptopenjdk/openjdk14:latest'
67-
label 'data'
68-
args '-v $HOME:/tmp/jenkins-home'
69-
}
69+
label 'data'
7070
}
7171
options { timeout(time: 30, unit: 'MINUTES') }
7272
steps {
73-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -B'
73+
script {
74+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
75+
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
76+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -B'
77+
}
78+
}
79+
}
7480
}
7581
}
7682
}
@@ -84,11 +90,7 @@ pipeline {
8490
}
8591
}
8692
agent {
87-
docker {
88-
image 'adoptopenjdk/openjdk8:latest'
89-
label 'data'
90-
args '-v $HOME:/tmp/jenkins-home'
91-
}
93+
label 'data'
9294
}
9395
options { timeout(time: 20, unit: 'MINUTES') }
9496

@@ -97,25 +99,31 @@ pipeline {
9799
}
98100

99101
steps {
100-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
101-
'-Dartifactory.server=https://repo.spring.io ' +
102-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
103-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
104-
"-Dartifactory.staging-repository=libs-snapshot-local " +
105-
"-Dartifactory.build-name=spring-data-build-without-bom " +
106-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
107-
'-Dmaven.test.skip=true clean dependency:tree source:jar javadoc:javadoc javadoc:jar deploy -pl "!bom" -B -U'
102+
script {
103+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
104+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
105+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
106+
'-Dartifactory.server=https://repo.spring.io ' +
107+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
108+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
109+
"-Dartifactory.staging-repository=libs-snapshot-local " +
110+
"-Dartifactory.build-name=spring-data-build-without-bom " +
111+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
112+
'-Dmaven.test.skip=true clean dependency:tree source:jar javadoc:javadoc javadoc:jar deploy -pl "!bom" -B -U'
113+
114+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom,bom-client -B -U'
108115

109-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom,bom-client -B -U'
110-
111-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
112-
'-Dartifactory.server=https://repo.spring.io ' +
113-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
114-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
115-
"-Dartifactory.staging-repository=libs-snapshot-local " +
116-
"-Dartifactory.build-name=spring-data-build-bom " +
117-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
118-
'-Dmaven.test.skip=true clean deploy -pl bom -B -U'
116+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
117+
'-Dartifactory.server=https://repo.spring.io ' +
118+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
119+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
120+
"-Dartifactory.staging-repository=libs-snapshot-local " +
121+
"-Dartifactory.build-name=spring-data-build-bom " +
122+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
123+
'-Dmaven.test.skip=true clean deploy -pl bom -B -U'
124+
}
125+
}
126+
}
119127
}
120128
}
121129
}

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,11 @@
265265
<id>spring-libs-release</id>
266266
<url>https://repo.spring.io/libs-release</url>
267267
</pluginRepository>
268+
<pluginRepository>
269+
<id>bintray-plugins</id>
270+
<name>bintray-plugins</name>
271+
<url>https://jcenter.bintray.com</url>
272+
</pluginRepository>
268273
</pluginRepositories>
269274

270275
</project>

0 commit comments

Comments
 (0)