1. docker
  2. Commit a18eea2702791ec0095a2256d4c9906050fcd1a2
Browse code

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>

Andrew Hsu authored on 2019/09/13 08:50:33
Showing 1 changed files
Jenkinsfile
History View file @ a18eea2
... ... 
@@ -440,7 +440,7 @@ pipeline {
440 440 
                 stage('s390x integration-cli') {
441 441 
                     when {
442 442 
                         beforeAgent true
443 
-                        branch 'master'
443 
+                        not { changeRequest() }
444 444 
                         expression { params.s390x }
445 445 
                     }
446 446 
                     agent { label 's390x-ubuntu-1604' }
... ... 
@@ -613,7 +613,7 @@ pipeline {
613 613 
                 stage('ppc64le integration-cli') {
614 614 
                     when {
615 615 
                         beforeAgent true
616 
-                        branch 'master'
616 
+                        not { changeRequest() }
617 617 
                         expression { params.ppc64le }
618 618 
                     }
619 619 
                     agent { label 'ppc64le-ubuntu-1604' }