Skip to content

Commit e46534c

Browse files
committed
Simplify build pipeline.
See #1537
1 parent 2a4983c commit e46534c

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

Jenkinsfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ pipeline {
1313

1414
stages {
1515
stage("test: baseline (Java 17)") {
16-
when {
17-
anyOf {
18-
branch 'main'
19-
not { triggeredBy 'UpstreamCause' }
20-
}
21-
}
2216
agent {
2317
label 'data'
2418
}
@@ -29,7 +23,7 @@ pipeline {
2923
steps {
3024
script {
3125
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
32-
docker.image('openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
26+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
3327
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
3428
}
3529
}
@@ -38,12 +32,6 @@ pipeline {
3832
}
3933

4034
stage('Build project and release to artifactory') {
41-
when {
42-
anyOf {
43-
branch 'main'
44-
not { triggeredBy 'UpstreamCause' }
45-
}
46-
}
4735
agent {
4836
label 'data'
4937
}
@@ -56,7 +44,7 @@ pipeline {
5644
steps {
5745
script {
5846
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
59-
docker.image('openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
47+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
6048
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
6149
'-Dartifactory.server=https://repo.spring.io ' +
6250
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)