#1181 - Only test other versions for local changes on main branch.

2020-09-17 11:30:24 -05:00
parent 3511279f2c
commit 641b585c73
1 changed files with 6 additions and 12 deletions
--- a/18
+++ b/18
@@ -33,14 +33,14 @@ pipeline {
 		}

 		stage("Test other configurations") {
+			when {
+				allOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
 			parallel {
 				stage("test: baseline (jdk11)") {
-					when {
-						anyOf {
-							branch 'master'
-							not { triggeredBy 'UpstreamCause' }
-						}
-					}
 					agent {
 						docker {
 							image 'adoptopenjdk/openjdk11:latest'
@@ -55,12 +55,6 @@ pipeline {
 				}

 				stage("test: baseline (jdk14)") {
-					when {
-						anyOf {
-							branch 'master'
-							not { triggeredBy 'UpstreamCause' }
-						}
-					}
 					agent {
 						docker {
 							image 'adoptopenjdk/openjdk14:latest'