diff --git a/Jenkinsfile b/Jenkinsfile index a002723b6b3..d03746d0b6a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 { diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 2e5b5d959f4..ca4e34043da 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -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 @@ -60,30 +60,44 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended #windows-2008: See https://github.com/elastic/beats/issues/19799 # mage: "mage build unitTest" @@ -100,6 +114,9 @@ stages: # platforms: ## override default labels in this specific stage. # - "windows-7-32-bit" # stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index 60ad7d3accf..1bcf125da5c 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -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 @@ -72,26 +72,40 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: 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-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended #windows-7: See https://github.com/elastic/beats/issues/22317 # mage: "mage build unitTest" @@ -104,6 +118,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index 4eae0d100ef..c1a7c7f9c9d 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -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 @@ -59,30 +59,44 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -94,6 +108,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index e7ce5009caf..4918c32a495 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -48,30 +48,44 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" @@ -88,6 +102,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index bc0f8a13bee..6fd03f83bb9 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -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 @@ -52,35 +52,53 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -92,6 +110,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 092dc805341..24193a3dbf3 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -24,7 +24,7 @@ stages: crosscompile: make: "make -C winlogbeat crosscompile" stage: mandatory - windows: + windows-2019: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" @@ -33,26 +33,31 @@ stages: 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -64,6 +69,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 9dbb5f77dfa..5f4156c1864 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -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. @@ -52,35 +52,53 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -92,6 +110,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index 96944541255..8e738a54ab3 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -32,7 +32,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 @@ -49,35 +49,49 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended - windows: + windows-2019: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" +<<<<<<< HEAD stage: mandatory +======= + stage: extended_win + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: extended +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -89,6 +103,9 @@ stages: # platforms: ## override default labels in this specific stage. # - "windows-7-32-bit" # stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index c5647d9a854..c65bbc0827b 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -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 @@ -65,41 +65,62 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) cloud: cloud: "mage build test" withModule: true ## run the ITs only if the changeset affects a specific module. diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index f3b4bf10973..594bef11d52 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -49,35 +49,53 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -89,6 +107,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/heartbeat/Jenkinsfile.yml b/x-pack/heartbeat/Jenkinsfile.yml index 96a48489c62..5015ea8c91b 100644 --- a/x-pack/heartbeat/Jenkinsfile.yml +++ b/x-pack/heartbeat/Jenkinsfile.yml @@ -43,35 +43,40 @@ stages: # TODO: there are windows test failures already reported # https://github.com/elastic/beats/issues/23957 and https://github.com/elastic/beats/issues/23958 # waiting for being fixed. -# windows: +# windows-2019: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-2019" -# stage: mandatory +# stage: extended_win # windows-2016: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-2016" -# stage: extended +# stage: mandatory # windows-2012: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-2012-r2" -# stage: extended +# stage: extended_win # windows-10: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-10" +<<<<<<< HEAD # stage: extended # windows-2008: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-2008-r2" # stage: extended +======= +# stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) # windows-8: # mage: "mage build test" # platforms: ## override default labels in this specific stage. # - "windows-8" +<<<<<<< HEAD # stage: extended # windows-7: # mage: "mage build test" @@ -83,6 +88,9 @@ stages: # platforms: ## override default labels in this specific stage. # - "windows-7-32-bit" # stage: extended +======= +# stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index db7fb380c50..074c7a2f117 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -70,35 +70,53 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -111,6 +129,9 @@ stages: # platforms: ## override default labels in this specific stage. # - "windows-7-32-bit" # stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/osquerybeat/Jenkinsfile.yml b/x-pack/osquerybeat/Jenkinsfile.yml index 6ebd028027b..6aef23327c9 100644 --- a/x-pack/osquerybeat/Jenkinsfile.yml +++ b/x-pack/osquerybeat/Jenkinsfile.yml @@ -38,41 +38,62 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" stage: mandatory +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2019" + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 1771a576f07..70da360cdb4 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -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 @@ -52,36 +52,54 @@ stages: - "macosTest" tags: true ## for all the tags stage: extended +<<<<<<< HEAD windows: +======= + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" + stage: mandatory + windows-2019: +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) mage: "mage build unitTest" withModule: true platforms: ## override default labels in this specific stage. - "windows-2019" +<<<<<<< HEAD stage: mandatory +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -93,6 +111,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index c3ae1a0a730..60d71aa2117 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -28,31 +28,44 @@ stages: withModule: true platforms: ## override default labels in this specific stage. - "windows-2019" +<<<<<<< HEAD +======= + stage: extended + windows-2022: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2022" +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) stage: mandatory 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" +<<<<<<< HEAD stage: extended windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" +<<<<<<< HEAD stage: extended windows-7: mage: "mage build unitTest" @@ -64,6 +77,9 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" stage: extended +======= + stage: extended_win +>>>>>>> f0912dac8b (ci: split windows in mandatory and ext_win stages (#30781)) packaging-linux: packaging-linux: "mage package" e2e: