diff --git a/Jenkinsfile b/Jenkinsfile index 43214eb755..a47b31566f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { booleanParam(name: 'amd64', defaultValue: true, description: 'amd64 (x86_64) Build/Test') booleanParam(name: 's390x', defaultValue: true, description: 'IBM Z (s390x) Build/Test') booleanParam(name: 'ppc64le', defaultValue: true, description: 'PowerPC (ppc64le) Build/Test') - booleanParam(name: 'windowsRS1', defaultValue: true, description: 'Windows 2016 (RS1) Build/Test') + booleanParam(name: 'windowsRS1', defaultValue: false, description: 'Windows 2016 (RS1) Build/Test') booleanParam(name: 'windowsRS5', defaultValue: true, description: 'Windows 2019 (RS5) Build/Test') booleanParam(name: 'skip_dco', defaultValue: false, description: 'Skip the DCO check') } @@ -728,7 +728,11 @@ pipeline { stage('win-RS1') { when { beforeAgent true - expression { params.windowsRS1 } + // Skip this stage on PRs unless the windowsRS1 checkbox is selected + anyOf { + not { changeRequest() } + expression { params.windowsRS1 } + } } environment { DOCKER_BUILDKIT = '0'