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 e653943e8b
)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
This commit is contained in:
parent
36fc8f5809
commit
a18eea2702
1 changed files with 2 additions and 2 deletions
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
|
@ -440,7 +440,7 @@ pipeline {
|
|||
stage('s390x integration-cli') {
|
||||
when {
|
||||
beforeAgent true
|
||||
branch 'master'
|
||||
not { changeRequest() }
|
||||
expression { params.s390x }
|
||||
}
|
||||
agent { label 's390x-ubuntu-1604' }
|
||||
|
@ -613,7 +613,7 @@ pipeline {
|
|||
stage('ppc64le integration-cli') {
|
||||
when {
|
||||
beforeAgent true
|
||||
branch 'master'
|
||||
not { changeRequest() }
|
||||
expression { params.ppc64le }
|
||||
}
|
||||
agent { label 'ppc64le-ubuntu-1604' }
|
||||
|
|
Loading…
Add table
Reference in a new issue