File tree 1 file changed +2
-14
lines changed 1 file changed +2
-14
lines changed Original file line number Diff line number Diff line change @@ -13,12 +13,6 @@ pipeline {
13
13
14
14
stages {
15
15
stage(" test: baseline (Java 17)" ) {
16
- when {
17
- anyOf {
18
- branch ' main'
19
- not { triggeredBy ' UpstreamCause' }
20
- }
21
- }
22
16
agent {
23
17
label ' data'
24
18
}
@@ -29,7 +23,7 @@ pipeline {
29
23
steps {
30
24
script {
31
25
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' ) {
33
27
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
34
28
}
35
29
}
@@ -38,12 +32,6 @@ pipeline {
38
32
}
39
33
40
34
stage(' Build project and release to artifactory' ) {
41
- when {
42
- anyOf {
43
- branch ' main'
44
- not { triggeredBy ' UpstreamCause' }
45
- }
46
- }
47
35
agent {
48
36
label ' data'
49
37
}
@@ -56,7 +44,7 @@ pipeline {
56
44
steps {
57
45
script {
58
46
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' ) {
60
48
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
61
49
' -Dartifactory.server=https://repo.spring.io ' +
62
50
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
You can’t perform that action at this time.
0 commit comments