Skip to content

Commit 10ab311

Browse files
gregturngregturn
committed
DATAJPA-1828 - Use Docker hub credentials for all CI jobs.
1 parent 45863dc commit 10ab311

File tree

2 files changed

+83
-69
lines changed

2 files changed

+83
-69
lines changed

‎Jenkinsfile‎

Lines changed: 78 additions & 69 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 -Dbundlor.enabled=false -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 -Dbundlor.enabled=false -U -B'
31+
}
32+
}
33+
}
3334
}
3435
}
3536

@@ -43,76 +44,81 @@ 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 -Dbundlor.enabled=false -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 -Dbundlor.enabled=false -U -B'
55+
}
56+
}
57+
}
5658
}
5759
}
5860

59-
stage("test: baseline (jdk14)") {
61+
stage("test: baseline (jdk15)") {
6062
agent {
61-
docker {
62-
image 'adoptopenjdk/openjdk14: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 -Dbundlor.enabled=false -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 -Dbundlor.enabled=false -U -B'
71+
}
72+
}
73+
}
7174
}
7275
}
7376

7477
stage("test: eclipselink-next (jdk8)") {
7578
agent {
76-
docker {
77-
image 'adoptopenjdk/openjdk8:latest'
78-
label 'data'
79-
args '-v $HOME:/tmp/jenkins-home'
80-
}
79+
label 'data'
8180
}
8281
options { timeout(time: 30, unit: 'MINUTES') }
8382
steps {
84-
sh 'rm -rf ?'
85-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
83+
script {
84+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
85+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
86+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
87+
}
88+
}
89+
}
8690
}
8791
}
8892

8993
stage("test: eclipselink-next (jdk11)") {
9094
agent {
91-
docker {
92-
image 'adoptopenjdk/openjdk11:latest'
93-
label 'data'
94-
args '-v $HOME:/tmp/jenkins-home'
95-
}
95+
label 'data'
9696
}
9797
options { timeout(time: 30, unit: 'MINUTES') }
9898
steps {
99-
sh 'rm -rf ?'
100-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next,java11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
99+
script {
100+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
101+
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
102+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next,java11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
103+
}
104+
}
105+
}
101106
}
102107
}
103108

104-
stage("test: eclipselink-next (jdk14)") {
109+
stage("test: eclipselink-next (jdk15)") {
105110
agent {
106-
docker {
107-
image 'adoptopenjdk/openjdk14:latest'
108-
label 'data'
109-
args '-v $HOME:/tmp/jenkins-home'
110-
}
111+
label 'data'
111112
}
112113
options { timeout(time: 30, unit: 'MINUTES') }
113114
steps {
114-
sh 'rm -rf ?'
115-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next,java11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
115+
script {
116+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
117+
docker.image('adoptopenjdk/openjdk15:latest').inside('-v $HOME:/tmp/jenkins-home') {
118+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Peclipselink-next,java11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
119+
}
120+
}
121+
}
116122
}
117123
}
118124
}
@@ -126,11 +132,7 @@ pipeline {
126132
}
127133
}
128134
agent {
129-
docker {
130-
image 'adoptopenjdk/openjdk8:latest'
131-
label 'data'
132-
args '-v $HOME:/tmp/jenkins-home'
133-
}
135+
label 'data'
134136
}
135137
options { timeout(time: 20, unit: 'MINUTES') }
136138

@@ -139,27 +141,28 @@ pipeline {
139141
}
140142

141143
steps {
142-
sh 'rm -rf ?'
143-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
144-
'-Dartifactory.server=https://repo.spring.io ' +
145-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
146-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
147-
"-Dartifactory.staging-repository=libs-snapshot-local " +
148-
"-Dartifactory.build-name=spring-data-jpa " +
149-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
150-
'-Dmaven.test.skip=true clean deploy -U -B'
144+
script {
145+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
146+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
147+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
148+
'-Dartifactory.server=https://repo.spring.io ' +
149+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
150+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
151+
"-Dartifactory.staging-repository=libs-snapshot-local " +
152+
"-Dartifactory.build-name=spring-data-jpa " +
153+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
154+
'-Dmaven.test.skip=true clean deploy -U -B'
155+
}
156+
}
157+
}
151158
}
152159
}
153160
stage('Publish documentation') {
154161
when {
155162
branch '2.3.x'
156163
}
157164
agent {
158-
docker {
159-
image 'adoptopenjdk/openjdk8:latest'
160-
label 'data'
161-
args '-v $HOME:/tmp/jenkins-home'
162-
}
165+
label 'data'
163166
}
164167
options { timeout(time: 20, unit: 'MINUTES') }
165168

@@ -168,12 +171,18 @@ pipeline {
168171
}
169172

170173
steps {
171-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
172-
'-Dartifactory.server=https://repo.spring.io ' +
173-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
174-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
175-
"-Dartifactory.distribution-repository=temp-private-local " +
176-
'-Dmaven.test.skip=true clean deploy -U -B'
174+
script {
175+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
176+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
177+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
178+
'-Dartifactory.server=https://repo.spring.io ' +
179+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
180+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
181+
"-Dartifactory.distribution-repository=temp-private-local " +
182+
'-Dmaven.test.skip=true clean deploy -U -B'
183+
}
184+
}
185+
}
177186
}
178187
}
179188
}

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,11 @@
459459
<id>spring-libs-milestone</id>
460460
<url>https://repo.spring.io/libs-milestone</url>
461461
</pluginRepository>
462+
<pluginRepository>
463+
<id>bintray-plugins</id>
464+
<name>bintray-plugins</name>
465+
<url>https://jcenter.bintray.com</url>
466+
</pluginRepository>
462467
</pluginRepositories>
463468

464469
</project>

0 commit comments

Comments
 (0)