Skip to content

Commit b9f8d36

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

File tree

1 file changed

+4
-30
lines changed

1 file changed

+4
-30
lines changed

Diff for: Jenkinsfile

+4-30
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ pipeline {
1414
stages {
1515
stage("test: baseline (Java 17)") {
1616
when {
17+
beforeAgent(true)
1718
anyOf {
18-
branch ''
19+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
1920
not { triggeredBy 'UpstreamCause' }
2021
}
2122
}
@@ -39,8 +40,9 @@ pipeline {
3940

4041
stage('Release to artifactory') {
4142
when {
43+
beforeAgent(true)
4244
anyOf {
43-
branch ''
45+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
4446
not { triggeredBy 'UpstreamCause' }
4547
}
4648
}
@@ -70,34 +72,6 @@ pipeline {
7072
}
7173
}
7274
}
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-
}
10175
}
10276

10377
post {

0 commit comments

Comments
 (0)