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.

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

update windows matrix support #30373

Merged
merged 1 commit into from
Feb 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
update windows matrix support
  • Loading branch information
v1v committed Feb 14, 2022
commit 8f6302dc3f3c993ff5b58d5776f35c7145b2b984
15 changes: 0 additions & 15 deletions auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
#windows-2008: See https://github.com/elastic/beats/issues/19799
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-2008-r2"
# stage: extended
#windows-7: See https://github.com/elastic/beats/issues/19831
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7"
# stage: extended
#windows-7-32: See https://github.com/elastic/beats/issues/19831
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7-32-bit"
# stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
12 changes: 0 additions & 12 deletions filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
#- "windows-2008-r2" https://github.com/elastic/beats/issues/19795
stage: mandatory
windows-2016:
mage: "mage build unitTest"
Expand All @@ -87,17 +86,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
#windows-7: See https://github.com/elastic/beats/issues/22317
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7"
# when: ## Override the top-level when.
# stage: packaging
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
10 changes: 0 additions & 10 deletions heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand All @@ -54,16 +49,6 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/elastic-agent/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
#windows-7-32: See https://github.com/elastic/beats/issues/22316
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7-32-bit"
# stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
cloud:
cloud: "mage build test"
withModule: true ## run the ITs only if the changeset affects a specific module.
Expand Down Expand Up @@ -128,11 +118,6 @@ stages:
- "^x-pack/filebeat/Jenkinsfile.yml"
- "^x-pack/libbeat/common/aws/.*"
stage: extended
#windows-7-32: See https://github.com/elastic/beats/issues/22315
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7-32-bit"
# stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/functionbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,10 @@ stages:
# platforms: ## override default labels in this specific stage.
# - "windows-10"
# stage: extended
# windows-2008:
# mage: "mage build test"
# platforms: ## override default labels in this specific stage.
# - "windows-2008-r2"
# stage: extended
# windows-8:
# mage: "mage build test"
# platforms: ## override default labels in this specific stage.
# - "windows-8"
# stage: extended
# windows-7:
# mage: "mage build test"
# platforms: ## override default labels in this specific stage.
# - "windows-7"
# stage: extended
# windows-7-32:
# mage: "mage build test"
# platforms: ## override default labels in this specific stage.
# - "windows-7-32-bit"
# stage: extended
packaging-linux:
packaging-linux: "mage package"
Expand Down
16 changes: 0 additions & 16 deletions x-pack/metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
# windows-7-32 builder has been disabled due to https://github.com/elastic/beats/issues/24337
#windows-7-32:
# mage: "mage build unitTest"
# platforms: ## override default labels in this specific stage.
# - "windows-7-32-bit"
# stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
10 changes: 0 additions & 10 deletions x-pack/osquerybeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,26 +73,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
15 changes: 0 additions & 15 deletions x-pack/winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,11 @@ stages:
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down