Skip to content

Commit ba8d5ec

Browse files
committed
Polishing.
Externalize artifactory credentials identifier. See #3976
1 parent ae47b6a commit ba8d5ec

File tree

2 files changed

+7
-36
lines changed

2 files changed

+7
-36
lines changed

Jenkinsfile

+7-36
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ pipeline {
5858
}
5959
}
6060
}
61-
stage('Publish JDK 15 + MongoDB 4.4') {
61+
stage('Publish JDK LTS + MongoDB 4.4') {
6262
when {
63-
changeset "ci/openjdk15-mongodb-4.4/**"
63+
changeset "ci/openjdk17-mongodb-4.4/**"
6464
changeset "ci/pipeline.properties"
6565
}
6666
agent { label 'data' }
6767
options { timeout(time: 30, unit: 'MINUTES') }
6868

6969
steps {
7070
script {
71-
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.15.tag']}", "--build-arg BASE=${p['docker.java.15.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk15-mongodb-4.4/")
71+
def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
7272
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7373
image.push()
7474
}
@@ -140,7 +140,7 @@ pipeline {
140140
}
141141
}
142142

143-
stage("test: baseline (jdk15)") {
143+
stage("test: baseline (LTS)") {
144144
agent {
145145
label 'data'
146146
}
@@ -151,13 +151,13 @@ pipeline {
151151
steps {
152152
script {
153153
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
154-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.15.tag']}").inside(p['docker.java.inside.basic']) {
154+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
155155
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
156156
sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
157157
sh 'sleep 10'
158158
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
159159
sh 'sleep 15'
160-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
160+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
161161
}
162162
}
163163
}
@@ -185,7 +185,7 @@ pipeline {
185185
steps {
186186
script {
187187
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
188-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
188+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
189189
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
190190
'-Dartifactory.server=https://repo.spring.io ' +
191191
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -199,35 +199,6 @@ pipeline {
199199
}
200200
}
201201
}
202-
203-
stage('Publish documentation') {
204-
when {
205-
branch '3.2.x'
206-
}
207-
agent {
208-
label 'data'
209-
}
210-
options { timeout(time: 20, unit: 'MINUTES') }
211-
212-
environment {
213-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
214-
}
215-
216-
steps {
217-
script {
218-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
219-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
220-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
221-
'-Dartifactory.server=https://repo.spring.io ' +
222-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
223-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
224-
"-Dartifactory.distribution-repository=temp-private-local " +
225-
'-Dmaven.test.skip=true clean deploy -U -B'
226-
}
227-
}
228-
}
229-
}
230-
}
231202
}
232203

233204
post {

0 commit comments

Comments
 (0)