Skip to content

Commit df435c4

Browse files
committed
Polishing.
See #2423
1 parent 85517cb commit df435c4

File tree

1 file changed

+5
-30
lines changed

1 file changed

+5
-30
lines changed

Jenkinsfile

+5-30
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pipeline {
44
triggers {
55
pollSCM 'H/10 * * * *'
66
upstream(upstreamProjects: "spring-data-build/3.0.x", threshold: hudson.model.Result.SUCCESS)
7+
cron '@daily'
78
}
89

910
options {
@@ -14,8 +15,9 @@ pipeline {
1415
stages {
1516
stage("test: baseline (Java 17)") {
1617
when {
18+
beforeAgent(true)
1719
anyOf {
18-
branch ''
20+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
1921
not { triggeredBy 'UpstreamCause' }
2022
}
2123
}
@@ -39,8 +41,9 @@ pipeline {
3941

4042
stage('Release to artifactory') {
4143
when {
44+
beforeAgent(true)
4245
anyOf {
43-
branch ''
46+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
4447
not { triggeredBy 'UpstreamCause' }
4548
}
4649
}
@@ -70,34 +73,6 @@ pipeline {
7073
}
7174
}
7275
}
73-
stage('Publish documentation') {
74-
when {
75-
branch ''
76-
}
77-
agent {
78-
label 'data'
79-
}
80-
options { timeout(time: 20, unit: 'MINUTES') }
81-
82-
environment {
83-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
84-
}
85-
86-
steps {
87-
script {
88-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
89-
docker.image('openjdk/openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
90-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
91-
'-Dartifactory.server=https://repo.spring.io ' +
92-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
93-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
94-
"-Dartifactory.distribution-repository=temp-private-local " +
95-
'-Dmaven.test.skip=true clean deploy -U -B'
96-
}
97-
}
98-
}
99-
}
100-
}
10176
}
10277

10378
post {

0 commit comments

Comments
 (0)