From 95c4ba8e19683cee2b639f03ffef096bfbb5bbb8 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 26 Jan 2021 10:41:52 +0000 Subject: [PATCH 1/2] [CI] Mandatory windows support for all the versions (#23615) --- .ci/scripts/generate_build_table.py | 11 +---- auditbeat/Jenkinsfile.yml | 36 +++++--------- filebeat/Jenkinsfile.yml | 36 +++++--------- heartbeat/Jenkinsfile.yml | 63 ++++++++---------------- metricbeat/Jenkinsfile.yml | 61 +++++++++++------------ packetbeat/Jenkinsfile.yml | 73 ++++++++++------------------ winlogbeat/Jenkinsfile.yml | 54 +++++++------------- x-pack/auditbeat/Jenkinsfile.yml | 49 ------------------- x-pack/elastic-agent/Jenkinsfile.yml | 42 ---------------- x-pack/filebeat/Jenkinsfile.yml | 42 ---------------- x-pack/functionbeat/Jenkinsfile.yml | 49 ------------------- x-pack/metricbeat/Jenkinsfile.yml | 46 ++---------------- x-pack/packetbeat/Jenkinsfile.yml | 49 ------------------- x-pack/winlogbeat/Jenkinsfile.yml | 49 ------------------- 14 files changed, 126 insertions(+), 534 deletions(-) diff --git a/.ci/scripts/generate_build_table.py b/.ci/scripts/generate_build_table.py index 21fe5d67107..b1e8ffce4e2 100755 --- a/.ci/scripts/generate_build_table.py +++ b/.ci/scripts/generate_build_table.py @@ -39,14 +39,7 @@ if "withModule" in doc["stages"][stage]: withModule = doc["stages"][stage]["withModule"] if "when" in doc["stages"][stage]: - when = f"{when}/:star:" + if "not_changeset_full_match" not in doc["stages"][stage]["when"]: + when = "optional" print("| {} | {} | `{}` | {} | `{}` | {} |".format( module, stage, command, withModule, platforms, when)) - -print("> :palm_tree: -> Git Branch based") -print("> :label: -> GitHub Pull Request Label based") -print("> :file_folder: -> Changeset based") -print("> :speech_balloon: -> GitHub Pull Request comment based") -print("> :taco: -> Git tag based") -print("> :smiley: -> Manual UI interaction based") -print("> :star: -> More specific cases based") diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 3a022706d8c..755449b552c 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -72,45 +72,33 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags #windows-7: See https://github.com/elastic/beats/issues/19831 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index 403b1fcc291..1680583d1bc 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -66,34 +66,25 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test filebeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test filebeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test filebeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags #windows-7: See https://github.com/elastic/beats/issues/22317 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. @@ -110,9 +101,6 @@ stages: platforms: ## override default labels in this specific stage. - "windows-7-32-bit" when: ## Override the top-level when. - comments: - - "/test filebeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index fcea6a9ace7..ce0488be4e3 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -64,75 +64,54 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tag + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tag + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tag + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" when: ## Override the top-level when. - comments: - - "/test heartbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index 7708cdda4c3..f7082c1f8d4 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -73,53 +73,54 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test metricbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" when: ## Override the top-level when. - comments: - - "/test metricbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test metricbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test metricbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags + windows-2008: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-2008-r2" + when: ## Override the top-level when. + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" when: ## Override the top-level when. - comments: - - "/test metricbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags + windows-7-32: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-7-32-bit" + when: ## Override the top-level when. + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index 02c0e86d049..b79b87b6d88 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -64,75 +64,54 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" when: ## Override the top-level when. - comments: - - "/test packetbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags - #windows-7-32: See https://github.com/elastic/beats/issues/22303 - # mage: "mage build unitTest" - # platforms: ## override default labels in this specific stage. - # - "windows-7-32-bit" - # when: ## Override the top-level when. - # comments: - # - "/test packetbeat for windows-7-32" - # labels: - # - "windows-7-32" - # branches: true ## for all the branches - # tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags + windows-7-32: + mage: "mage build unitTest" + platforms: ## override default labels in this specific stage. + - "windows-7-32-bit" + when: ## Override the top-level when. + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 0c78d81a60d..bcef5172022 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -39,64 +39,46 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2016" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" when: ## Override the top-level when. - comments: - - "/test winlogbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags + not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 99321a98cca..98feb454191 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -55,76 +55,27 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/auditbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/auditbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/auditbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/auditbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/auditbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" - when: ## Override the top-level when. - comments: - - "/test auditbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index a237c483aad..0e6ecef9e4c 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -54,68 +54,26 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/elastic-agent for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags #windows-7-32: See https://github.com/elastic/beats/issues/22316 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index 672d07ad2e0..2b72ef8ec6f 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -55,68 +55,26 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/filebeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags #windows-7-32: See https://github.com/elastic/beats/issues/22315 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index 59d3ddf22dd..ec9a4ec57f0 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -52,76 +52,27 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" - when: ## Override the top-level when. - comments: - - "/test x-pack/functionbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index ce7368f672d..a021fa117ae 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -54,65 +54,27 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags +# windows-7-32: +# mage: "mage build unitTest" +# platforms: ## override default labels in this specific stage. +# - "windows-7-32-bit" diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 14188bc6236..57826b59cff 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -27,76 +27,27 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/packetbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/packetbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/packetbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/packetbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" - when: ## Override the top-level when. - comments: - - "/test x-pack/packetbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index 4153e0587e2..5ca64db11f5 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -29,76 +29,27 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2016" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-2016" - labels: - - "windows-2016" - branches: true ## for all the branches - tags: true ## for all the tags windows-2012: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2012-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-2012" - labels: - - "windows-2012" - branches: true ## for all the branches - tags: true ## for all the tags windows-10: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-10" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-10" - labels: - - "windows-10" - branches: true ## for all the branches - tags: true ## for all the tags windows-2008: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2008-r2" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-2008" - labels: - - "windows-2008" - branches: true ## for all the branches - tags: true ## for all the tags windows-8: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-8" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-8" - labels: - - "windows-8" - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-7" - labels: - - "windows-7" - branches: true ## for all the branches - tags: true ## for all the tags windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-7-32-bit" - when: ## Override the top-level when. - comments: - - "/test x-pack/winlogbeat for windows-7-32" - labels: - - "windows-7-32" - branches: true ## for all the branches - tags: true ## for all the tags From bac67478e62c31ca940893de81fac8af15694129 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 27 Jan 2021 14:13:44 +0000 Subject: [PATCH 2/2] Apply suggestions from code review --- metricbeat/Jenkinsfile.yml | 16 ---------------- packetbeat/Jenkinsfile.yml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index f7082c1f8d4..e2c4daf4427 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -100,14 +100,6 @@ stages: not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack branches: true ## for all the branches tags: true ## for all the tags - windows-2008: - mage: "mage build unitTest" - platforms: ## override default labels in this specific stage. - - "windows-2008-r2" - when: ## Override the top-level when. - not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack - branches: true ## for all the branches - tags: true ## for all the tags windows-7: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. @@ -116,11 +108,3 @@ stages: not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack branches: true ## for all the branches tags: true ## for all the tags - windows-7-32: - mage: "mage build unitTest" - platforms: ## override default labels in this specific stage. - - "windows-7-32-bit" - when: ## Override the top-level when. - not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack - branches: true ## for all the branches - tags: true ## for all the tags diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index b79b87b6d88..3927bddcb53 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -107,11 +107,11 @@ stages: not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack branches: true ## for all the branches tags: true ## for all the tags - windows-7-32: - mage: "mage build unitTest" - platforms: ## override default labels in this specific stage. - - "windows-7-32-bit" - when: ## Override the top-level when. - not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack - branches: true ## for all the branches - tags: true ## for all the tags + #windows-7-32: See https://github.com/elastic/beats/issues/22303 + # mage: "mage build unitTest" + # platforms: ## override default labels in this specific stage. + # - "windows-7-32-bit" + # when: ## Override the top-level when. + # not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack + # branches: true ## for all the branches + # tags: true ## for all the tags