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: split windows in mandatory and ext_win stages #30781

Merged
merged 5 commits into from
Mar 15, 2022
Merged

ci: split windows in mandatory and ext_win stages #30781

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
236bd30
ci: split windows in mandatory and ext_win stages
v1v Mar 11, 2022
5c19038
ci: leftovers
v1v Mar 14, 2022
c6fb143
ci: leftovers
v1v Mar 14, 2022
3d07fbb
revert tags
v1v Mar 14, 2022
2efba89
revert tags
v1v Mar 14, 2022
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
17 changes: 17 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,23 @@ pipeline {
runBuildAndTest(filterStage: 'extended')
}
}
stage('ExtendedWin') {
options { skipDefaultCheckout() }
when {
// On a branches/tags, skip if changes are only related to docs.
// Always when forcing the input parameter
anyOf {
allOf { // If no PR and no docs changes
expression { return env.ONLY_DOCS == "false" }
not { changeRequest() }
}
expression { return params.runAllStages } // If UI forced
}
}
steps {
runBuildAndTest(filterStage: 'extended_win')
}
}
stage('Packaging') {
options { skipDefaultCheckout() }
when {
Expand Down
25 changes: 10 additions & 15 deletions auditbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ when:
- "auditbeat"
parameters: ## when parameter was selected in the UI.
- "auditbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
stages:
lint:
Expand All @@ -33,8 +32,7 @@ stages:
parameters:
- "armTest"
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
stage: mandatory
unitTest:
mage: "mage build unitTest"
stage: mandatory
Expand All @@ -52,46 +50,44 @@ stages:
- "macOS"
parameters:
- "macosTest"
tags: true ## for all the tags
stage: extended
windows:
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
- "windows-2022"
stage: mandatory
windows-2022:
windows-2019:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2022"
stage: extended
- "windows-2019"
stage: extended_win
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: mandatory
windows-2012:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
stage: extended_win
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
stage: extended_win
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^auditbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
Expand All @@ -104,7 +100,6 @@ stages:
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^auditbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
22 changes: 9 additions & 13 deletions filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ when:
- "filebeat"
parameters: ## when parameter was selected in the UI.
- "filebeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
stages:
lint:
Expand All @@ -33,8 +32,7 @@ stages:
parameters:
- "armTest"
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
stage: mandatory
unitTest:
mage: "mage build unitTest"
stage: mandatory
Expand Down Expand Up @@ -66,39 +64,38 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
windows:
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
- "windows-2022"
stage: mandatory
windows-2022:
windows-2019:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2022"
stage: extended
- "windows-2019"
stage: extended_win
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: mandatory
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
stage: extended_win
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^filebeat/.*"
- "@oss" ## special token regarding the changeset for the oss
Expand All @@ -111,7 +108,6 @@ stages:
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^filebeat/.*"
- "@oss" ## special token regarding the changeset for the oss
25 changes: 10 additions & 15 deletions heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ when:
- "heartbeat"
parameters: ## when parameter was selected in the UI.
- "heartbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
stages:
lint:
Expand All @@ -33,8 +32,7 @@ stages:
parameters:
- "armTest"
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
stage: mandatory
unitTest:
mage: "mage build unitTest"
stage: mandatory
Expand All @@ -57,46 +55,44 @@ stages:
- "macOS"
parameters:
- "macosTest"
tags: true ## for all the tags
stage: extended
windows:
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
- "windows-2022"
stage: mandatory
windows-2022:
windows-2019:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2022"
stage: extended
- "windows-2019"
stage: extended_win
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: mandatory
windows-2012:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
stage: extended_win
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
stage: extended_win
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^heartbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
Expand All @@ -109,7 +105,6 @@ stages:
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^heartbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
18 changes: 8 additions & 10 deletions metricbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ when:
- "metricbeat"
parameters: ## when parameter was selected in the UI.
- "metricbeat"
tags: true ## for all the tags
platform: "immutable && ubuntu-18" ## default label for all the stages
stages:
lint:
Expand Down Expand Up @@ -46,38 +45,37 @@ stages:
- "macOS"
parameters:
- "macosTest"
tags: true ## for all the tags
stage: extended
windows:
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
- "windows-2022"
stage: mandatory
windows-2022:
windows-2019:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2022"
- "windows-2019"
stage: extended
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: mandatory
windows-2012:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
stage: extended_win
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
stage: extended_win
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
24 changes: 10 additions & 14 deletions packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ stages:
parameters:
- "armTest"
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
stage: mandatory
unitTest:
mage: "mage build unitTest"
stage: mandatory
Expand All @@ -50,46 +49,44 @@ stages:
- "macOS"
parameters:
- "macosTest"
tags: true ## for all the tags
stage: extended
windows:
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2019"
- "windows-2022"
stage: mandatory
windows-2022:
windows-2019:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2022"
stage: extended
- "windows-2019"
stage: extended_win
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: mandatory
windows-2012:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
stage: extended_win
windows-10:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended
stage: extended_win
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
enabled: false
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^packetbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
Expand All @@ -102,7 +99,6 @@ stages:
stage: packaging
when:
branches: false ## Only on a PR basis for the time being
tags: false ## packaging on branches/tags is already in place with the downstream build.
changeset: ## when PR contains any of those entries in the changeset
- "^packetbeat/.*"
- "@oss" ## special token regarding the changeset for the oss
Loading