diff --git a/Jenkinsfile b/Jenkinsfile index ff9559f..d946d22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { stage("Test other configurations") { when { - anyOf { + allOf { branch 'master' not { triggeredBy 'UpstreamCause' } } @@ -56,10 +56,10 @@ pipeline { } } - stage("test: baseline (jdk14)") { + stage("test: baseline (jdk15)") { agent { docker { - image 'adoptopenjdk/openjdk14:latest' + image 'adoptopenjdk/openjdk15:latest' label 'data' args '-v $HOME:/tmp/jenkins-home' }