From e653943e8befaff83d6ace9b6f943f0cc8027ae4 Mon Sep 17 00:00:00 2001
From: Andrew Hsu <andrewhsu@docker.com>
Date: Thu, 12 Sep 2019 23:50:33 +0000
Subject: [PATCH] run integration-cli stages on s390x and ppc64le if not a PR
 check

Essentially, run on merge to target branch which may or may not be
master branch. Could be 19.03 branch, for example.

See: https://jenkins.io/doc/book/pipeline/syntax/

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a47b31566f..f38190a6c4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -463,7 +463,7 @@ pipeline {
                 stage('s390x integration-cli') {
                     when {
                         beforeAgent true
-                        branch 'master'
+                        not { changeRequest() }
                         expression { params.s390x }
                     }
                     agent { label 's390x-ubuntu-1604' }
@@ -647,7 +647,7 @@ pipeline {
                 stage('ppc64le integration-cli') {
                     when {
                         beforeAgent true
-                        branch 'master'
+                        not { changeRequest() }
                         expression { params.ppc64le }
                     }
                     agent { label 'ppc64le-ubuntu-1604' }