From 641b585c7322df65570bd34690fe828d51b977d2 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Thu, 17 Sep 2020 11:30:24 -0500
Subject: [PATCH] #1181 - Only test other versions for local changes on main
 branch.

---
 Jenkinsfile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6e06f98a..5cd1d5cc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'