Skip to content

Commit 0419a4d

Browse files
authored
Add x-pack filebeat and metricbeat stages for Windows and OSX (elastic#18494)
Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack beats, so we cannot detect specific issues on these platforms, like the compilation error in Windows solved by elastic#18477, that was introduced after a green build. Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.
1 parent aae80a6 commit 0419a4d

1 file changed

Lines changed: 52 additions & 0 deletions

File tree

Jenkinsfile

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,19 @@ pipeline {
162162
mageTarget("Filebeat oss Mac OS X", "filebeat", "build unitTest")
163163
}
164164
}
165+
stage('Filebeat x-pack Mac OS X'){
166+
agent { label 'macosx' }
167+
options { skipDefaultCheckout() }
168+
when {
169+
beforeAgent true
170+
expression {
171+
return env.BUILD_XPACK_FILEBEAT != "false" && params.macosTest
172+
}
173+
}
174+
steps {
175+
mageTarget("Filebeat x-pack Mac OS X", "x-pack/filebeat", "build unitTest")
176+
}
177+
}
165178
stage('Filebeat Windows'){
166179
agent { label 'windows-immutable && windows-2019' }
167180
options { skipDefaultCheckout() }
@@ -175,6 +188,19 @@ pipeline {
175188
mageTargetWin("Filebeat oss Windows Unit test", "filebeat", "build unitTest")
176189
}
177190
}
191+
stage('Filebeat x-pack Windows'){
192+
agent { label 'windows-immutable && windows-2019' }
193+
options { skipDefaultCheckout() }
194+
when {
195+
beforeAgent true
196+
expression {
197+
return env.BUILD_FILEBEAT_XPACK != "false" && params.windowsTest
198+
}
199+
}
200+
steps {
201+
mageTargetWin("Filebeat x-pack Windows", "x-pack/filebeat", "build unitTest")
202+
}
203+
}
178204
stage('Heartbeat'){
179205
agent { label 'ubuntu && immutable' }
180206
options { skipDefaultCheckout() }
@@ -419,6 +445,19 @@ pipeline {
419445
mageTarget("Metricbeat OSS Mac OS X", "metricbeat", "build unitTest")
420446
}
421447
}
448+
stage('Metricbeat x-pack Mac OS X'){
449+
agent { label 'macosx' }
450+
options { skipDefaultCheckout() }
451+
when {
452+
beforeAgent true
453+
expression {
454+
return env.BUILD_METRICBEAT_XPACK != "false" && params.macosTest
455+
}
456+
}
457+
steps {
458+
mageTarget("Metricbeat x-pack Mac OS X", "x-pack/metricbeat", "build unitTest")
459+
}
460+
}
422461
stage('Metricbeat Windows'){
423462
agent { label 'windows-immutable && windows-2019' }
424463
options { skipDefaultCheckout() }
@@ -432,6 +471,19 @@ pipeline {
432471
mageTargetWin("Metricbeat Windows Unit test", "metricbeat", "build unitTest")
433472
}
434473
}
474+
stage('Metricbeat x-pack Windows'){
475+
agent { label 'windows-immutable && windows-2019' }
476+
options { skipDefaultCheckout() }
477+
when {
478+
beforeAgent true
479+
expression {
480+
return env.BUILD_METRICBEAT_XPACK != "false" && params.windowsTest
481+
}
482+
}
483+
steps {
484+
mageTargetWin("Metricbeat x-pack Windows", "x-pack/metricbeat", "build unitTest")
485+
}
486+
}
435487
stage('Packetbeat'){
436488
agent { label 'ubuntu && immutable' }
437489
options { skipDefaultCheckout() }

0 commit comments

Comments
 (0)