Skip to content

Commit

Permalink
[CI] support windows-2012 (#19773)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Jul 13, 2020
1 parent f91c96f commit 29b2d27
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .ci/windows.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import groovy.transform.Field
- 'windows-2012-r2', 'windows-2008-r2', 'windows-7', 'windows-7-32-bit' are disabled
since we are working on releasing each windows version incrementally.
*/
@Field def windowsVersions = ['windows-2019', 'windows-2016']
@Field def windowsVersions = ['windows-2019', 'windows-2016', 'windows-2012-r2']

pipeline {
agent { label 'ubuntu && immutable' }
Expand Down Expand Up @@ -349,9 +349,10 @@ def mageTargetWin(String context, String directory, String target, String label)
log(level: 'INFO', text: "context=${context} directory=${directory} target=${target} os=${label}")
def immutable = label.equals('windows-7-32-bit') ? 'windows-immutable-32-bit' : 'windows-immutable'

// NOTE: skip filebeat with windows-2016 since there are some test failures.
if (directory.equals('filebeat') && label.equals('windows-2016')) {
log(level: 'WARN', text: "Skipped stage for the 'filebeat' with 'windows-2016' as long as there are test failures to be analysed.")
// NOTE: skip filebeat with windows-2016/2012-r2 since there are some test failures.
// See https://github.com/elastic/beats/issues/19787 https://github.com/elastic/beats/issues/19641
if (directory.equals('filebeat') && (label.equals('windows-2016') || label.equals('windows-2012-r2'))) {
log(level: 'WARN', text: "Skipped stage for the 'filebeat' with '${label}' as long as there are test failures to be analysed.")
} else {
node("${immutable} && ${label}"){
withBeatsEnvWin() {
Expand Down

0 comments on commit 29b2d27

Please sign in to comment.