From c703c14dd23df66b7df9745c0d768f69289b3b86 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 21 Jan 2021 14:47:43 +0000 Subject: [PATCH 1/3] Enable filter for the no_change_set when condition --- .ci/scripts/generate_build_table.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/scripts/generate_build_table.py b/.ci/scripts/generate_build_table.py index 350eb3e83e3c..8cafc6743cda 100755 --- a/.ci/scripts/generate_build_table.py +++ b/.ci/scripts/generate_build_table.py @@ -31,6 +31,7 @@ if "withModule" in doc["stages"][stage]: withModule = doc["stages"][stage]["withModule"] if "when" in doc["stages"][stage]: - when = f"optional" + if "not_changeset_full_match" not in doc["stages"][stage]["when"]: + when = f"optional" print("| {} | {} | `{}` | {} | `{}` | {} |".format( module, stage, command, withModule, platforms, when)) From ae7062582da0f4da54393d55ba6749f2d95daad9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 21 Jan 2021 14:48:04 +0000 Subject: [PATCH 2/3] Mandatory windows support for all the versions --- auditbeat/Jenkinsfile.yml | 36 ++++++---------- filebeat/Jenkinsfile.yml | 36 ++++++---------- heartbeat/Jenkinsfile.yml | 63 ++++++++++------------------ metricbeat/Jenkinsfile.yml | 63 ++++++++++------------------ packetbeat/Jenkinsfile.yml | 63 ++++++++++------------------ winlogbeat/Jenkinsfile.yml | 52 ++++++++--------------- 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 | 49 ---------------------- x-pack/packetbeat/Jenkinsfile.yml | 49 ---------------------- x-pack/winlogbeat/Jenkinsfile.yml | 49 ---------------------- 13 files changed, 105 insertions(+), 537 deletions(-) diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 3a022706d8cd..755449b552c7 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 403b1fcc2910..1680583d1bcb 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 ac2fc59cc647..ce0488be4e33 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 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 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 3d624fbcaaa0..588c6bbbdb80 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -71,75 +71,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. - comments: - - "/test metricbeat 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-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. - comments: - - "/test metricbeat 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/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index 1d65795e0224..b79b87b6d883 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 + 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 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 diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index aad1d6558e9b..bcef5172022d 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -39,62 +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" + 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 99321a98cca7..98feb4541911 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 a237c483aada..0e6ecef9e4cd 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 672d07ad2e0f..2b72ef8ec6f1 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 59d3ddf22ddd..ec9a4ec57f09 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 8406f20f5ac9..0ce1e5fe1643 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -53,76 +53,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" - when: ## Override the top-level when. - comments: - - "/test x-pack/metricbeat 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/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index a668ba809ea5..9846a3f67e2a 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/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/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/packetbeat 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 4153e0587e2c..5ca64db11f53 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 69b66fdd3a4a1fff2f76896c86345bf50e53f4f1 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 25 Jan 2021 15:44:47 +0000 Subject: [PATCH 3/3] Update .ci/scripts/generate_build_table.py Co-authored-by: cachedout --- .ci/scripts/generate_build_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/generate_build_table.py b/.ci/scripts/generate_build_table.py index 8cafc6743cda..47e26cc17559 100755 --- a/.ci/scripts/generate_build_table.py +++ b/.ci/scripts/generate_build_table.py @@ -32,6 +32,6 @@ withModule = doc["stages"][stage]["withModule"] if "when" in doc["stages"][stage]: if "not_changeset_full_match" not in doc["stages"][stage]["when"]: - when = f"optional" + when = "optional" print("| {} | {} | `{}` | {} | `{}` | {} |".format( module, stage, command, withModule, platforms, when))