Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 039eb05ac87d52fe0b268c090f137eaa14754eed)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
| ... | ... |
@@ -12,7 +12,7 @@ pipeline {
|
| 12 | 12 |
booleanParam(name: 'amd64', defaultValue: true, description: 'amd64 (x86_64) Build/Test') |
| 13 | 13 |
booleanParam(name: 's390x', defaultValue: true, description: 'IBM Z (s390x) Build/Test') |
| 14 | 14 |
booleanParam(name: 'ppc64le', defaultValue: true, description: 'PowerPC (ppc64le) Build/Test') |
| 15 |
- booleanParam(name: 'windowsRS1', defaultValue: true, description: 'Windows 2016 (RS1) Build/Test') |
|
| 15 |
+ booleanParam(name: 'windowsRS1', defaultValue: false, description: 'Windows 2016 (RS1) Build/Test') |
|
| 16 | 16 |
booleanParam(name: 'windowsRS5', defaultValue: true, description: 'Windows 2019 (RS5) Build/Test') |
| 17 | 17 |
booleanParam(name: 'skip_dco', defaultValue: false, description: 'Skip the DCO check') |
| 18 | 18 |
} |
| ... | ... |
@@ -689,7 +689,11 @@ pipeline {
|
| 689 | 689 |
stage('win-RS1') {
|
| 690 | 690 |
when {
|
| 691 | 691 |
beforeAgent true |
| 692 |
- expression { params.windowsRS1 }
|
|
| 692 |
+ // Skip this stage on PRs unless the windowsRS1 checkbox is selected |
|
| 693 |
+ anyOf {
|
|
| 694 |
+ not { changeRequest() }
|
|
| 695 |
+ expression { params.windowsRS1 }
|
|
| 696 |
+ } |
|
| 693 | 697 |
} |
| 694 | 698 |
environment {
|
| 695 | 699 |
DOCKER_BUILDKIT = '0' |