From 3bef2d8134e496c3098a495adf0fdf123a774fd4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 20:53:24 +0000 Subject: [PATCH] update windows matrix support (#30373) (#30384) (cherry picked from commit 9d26aea48d4dcf14f146b8a328f5b463c5cfa12d) Co-authored-by: Victor Martinez --- auditbeat/Jenkinsfile.yml | 15 --------------- filebeat/Jenkinsfile.yml | 12 ------------ heartbeat/Jenkinsfile.yml | 10 ---------- metricbeat/Jenkinsfile.yml | 15 --------------- packetbeat/Jenkinsfile.yml | 15 --------------- winlogbeat/Jenkinsfile.yml | 15 --------------- x-pack/auditbeat/Jenkinsfile.yml | 15 --------------- x-pack/elastic-agent/Jenkinsfile.yml | 15 --------------- x-pack/filebeat/Jenkinsfile.yml | 15 --------------- x-pack/functionbeat/Jenkinsfile.yml | 15 --------------- x-pack/heartbeat/Jenkinsfile.yml | 15 --------------- x-pack/metricbeat/Jenkinsfile.yml | 16 ---------------- x-pack/osquerybeat/Jenkinsfile.yml | 10 ---------- x-pack/packetbeat/Jenkinsfile.yml | 15 --------------- x-pack/winlogbeat/Jenkinsfile.yml | 15 --------------- 15 files changed, 213 deletions(-) diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 7b17f617776..728cd7d3be9 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -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: diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index b77dc29f160..b7b9361cfde 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -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" @@ -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: diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index 4eae0d100ef..3cb6f8fc899 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -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: diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index e7ce5009caf..6d622cd8019 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -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: diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index bc0f8a13bee..5a469e45d91 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -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: diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 092dc805341..d48f0da2633 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -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. @@ -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: diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 9dbb5f77dfa..167e034882b 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -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: diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index 96944541255..09d4a2c42b0 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -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: diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index 79276187dfe..24a0029534b 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -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. @@ -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: diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index f3b4bf10973..fcec0044c0f 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -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: diff --git a/x-pack/heartbeat/Jenkinsfile.yml b/x-pack/heartbeat/Jenkinsfile.yml index 96a48489c62..1896e553cfa 100644 --- a/x-pack/heartbeat/Jenkinsfile.yml +++ b/x-pack/heartbeat/Jenkinsfile.yml @@ -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" diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index db7fb380c50..31d63d8d00f 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -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: diff --git a/x-pack/osquerybeat/Jenkinsfile.yml b/x-pack/osquerybeat/Jenkinsfile.yml index 6ebd028027b..4e63dd48267 100644 --- a/x-pack/osquerybeat/Jenkinsfile.yml +++ b/x-pack/osquerybeat/Jenkinsfile.yml @@ -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: diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 1771a576f07..e8bf9a618cf 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -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: diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index c3ae1a0a730..4ce2c6b4819 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -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: