Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 5b1c682

Browse files
committed
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> (cherry picked from commit e653943e8befaff83d6ace9b6f943f0cc8027ae4) Signed-off-by: Andrew Hsu <andrewhsu@docker.com> Upstream-commit: a18eea2702791ec0095a2256d4c9906050fcd1a2 Component: engine
1 parent 92ec966 commit 5b1c682

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

components/engine/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ pipeline {
440440
stage('s390x integration-cli') {
441441
when {
442442
beforeAgent true
443-
branch 'master'
443+
not { changeRequest() }
444444
expression { params.s390x }
445445
}
446446
agent { label 's390x-ubuntu-1604' }
@@ -613,7 +613,7 @@ pipeline {
613613
stage('ppc64le integration-cli') {
614614
when {
615615
beforeAgent true
616-
branch 'master'
616+
not { changeRequest() }
617617
expression { params.ppc64le }
618618
}
619619
agent { label 'ppc64le-ubuntu-1604' }

0 commit comments

Comments
 (0)