Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] support windows-2012 #19773

Merged
merged 4 commits into from
Jul 13, 2020
Merged

[CI] support windows-2012 #19773

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12e4322
[CI] support windows-2012
v1v Jul 9, 2020
2812287
disable filebeats in windows-2012
v1v Jul 9, 2020
82aa85e
Merge remote-tracking branch 'upstream/master' into feature/windows-2012
v1v Jul 9, 2020
f6462d4
Merge remote-tracking branch 'upstream/master' into feature/windows-2012
v1v Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .ci/windows.groovy
View file
Open in desktop
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.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add the GH issue to the log? So that reading the CI logs will add that information

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I'll add it to the other PRs to enable Windows-7, 8, 10 as I need to rebase them too, does it sound good?

} else {
node("${immutable} && ${label}"){
withBeatsEnvWin() {
Expand Down