Skip to content

Commit

Permalink
[7.17](backport #30781) ci: split windows in mandatory and ext_win st…
Browse files Browse the repository at this point in the history 
…ages (#30823)
  • Loading branch information
@mergify
mergify[bot] authored Mar 17, 2022
1 parent 8896780 commit 2645bbe
Show file tree
Hide file tree
Showing 16 changed files with 130 additions and 113 deletions.
17 changes: 17 additions & 0 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,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
16 changes: 8 additions & 8 deletions auditbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
- "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 @@ -69,37 +69,37 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
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
#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
# stage: extended_win
#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
# stage: extended_win
#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
# stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
12 changes: 6 additions & 6 deletions filebeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
- "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 @@ -82,28 +82,28 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
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
#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
# stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
14 changes: 7 additions & 7 deletions heartbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
- "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 @@ -68,32 +68,32 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
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
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
14 changes: 7 additions & 7 deletions metricbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,37 +58,37 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
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
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
stage: extended
stage: extended_win
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
16 changes: 8 additions & 8 deletions packetbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ stages:
- "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 @@ -61,37 +61,37 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
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-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
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
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
14 changes: 7 additions & 7 deletions winlogbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,37 +33,37 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
windows-2012:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended
stage: extended_win
windows-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-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
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
16 changes: 8 additions & 8 deletions x-pack/auditbeat/Jenkinsfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:
- "armTest"
branches: true ## for all the branches
tags: true ## for all the tags
stage: extended
stage: mandatory
build:
mage: "mage update build test"
withModule: true ## run the ITs only if the changeset affects a specific module.
Expand All @@ -61,37 +61,37 @@ stages:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: extended
stage: extended_win
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-2008:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-2008-r2"
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
windows-7:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7"
stage: extended
stage: extended_win
windows-7-32:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
- "windows-7-32-bit"
stage: extended
stage: extended_win
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
Loading

0 comments on commit 2645bbe

Please sign in to comment.