From dcda81e1b17a8bf417ff3ff56a00a0bf8ffe1c6b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Nov 2020 09:15:30 +0000 Subject: [PATCH 1/2] [CI] support windows-7-32 bits (#19797) --- .ci/scripts/install-tools.bat | 18 +++++++++++++++++- Jenkinsfile | 10 ++++++---- auditbeat/Jenkinsfile.yml | 1 + filebeat/Jenkinsfile.yml | 24 +++++++++++++++++++++++- heartbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ metricbeat/Jenkinsfile.yml | 1 + packetbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ winlogbeat/Jenkinsfile.yml | 24 +++++++++++++++++++++++- x-pack/auditbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ x-pack/elastic-agent/Jenkinsfile.yml | 22 ++++++++++++++++++++++ x-pack/filebeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ x-pack/functionbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ x-pack/metricbeat/Jenkinsfile.yml | 1 + x-pack/packetbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ x-pack/winlogbeat/Jenkinsfile.yml | 22 ++++++++++++++++++++++ 15 files changed, 248 insertions(+), 7 deletions(-) diff --git a/.ci/scripts/install-tools.bat b/.ci/scripts/install-tools.bat index 0603b4ba609b..e5251c0b9889 100755 --- a/.ci/scripts/install-tools.bat +++ b/.ci/scripts/install-tools.bat @@ -1,6 +1,12 @@ set GOPATH=%WORKSPACE% set MAGEFILE_CACHE=%WORKSPACE%\.magefile -set PATH=%WORKSPACE%\bin;C:\ProgramData\chocolatey\bin;%PATH% + +REM Configure GCC for either 32 or 64 bits +set MINGW_ARCH=64 +IF NOT EXIST "%PROGRAMFILES(X86)%" ( + set MINGW_ARCH=32 +) +set PATH=%WORKSPACE%\bin;C:\ProgramData\chocolatey\bin;C:\tools\mingw%MINGW_ARCH%\bin;%PATH% where /q curl IF ERRORLEVEL 1 ( @@ -25,3 +31,13 @@ if not exist C:\Python38\python.exe ( python --version where python +where /q gcc +IF ERRORLEVEL 1 ( + REM Install mingw 5.3.0 + choco install mingw -y -r --no-progress --version 5.3.0 + IF NOT ERRORLEVEL 0 ( + exit /b 1 + ) +) +gcc --version +where gcc diff --git a/Jenkinsfile b/Jenkinsfile index be00ae1f4e94..5455a097f689 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -284,15 +284,17 @@ def withBeatsEnv(Map args = [:], Closure body) { testResults = '**/build/TEST*.xml' artifacts = '**/build/TEST*.out' } else { + // NOTE: to support Windows 7 32 bits the arch in the mingw and go context paths is required. + def mingwArch = is32() ? '32' : '64' + def goArch = is32() ? '386' : 'amd64' def chocoPath = 'C:\\ProgramData\\chocolatey\\bin' - def mingw64Path = 'C:\\tools\\mingw64\\bin' def chocoPython3Path = 'C:\\Python38;C:\\Python38\\Scripts' - goRoot = "${env.USERPROFILE}\\.gvm\\versions\\go${GO_VERSION}.windows.amd64" - path = "${env.WORKSPACE}\\bin;${goRoot}\\bin;${chocoPath};${chocoPython3Path};${env.PATH};${mingw64Path}" + goRoot = "${env.USERPROFILE}\\.gvm\\versions\\go${GO_VERSION}.windows.${goArch}" + path = "${env.WORKSPACE}\\bin;${goRoot}\\bin;${chocoPath};${chocoPython3Path};C:\\tools\\mingw${mingwArch}\\bin;${env.PATH}" magefile = "${env.WORKSPACE}\\.magefile" testResults = "**\\build\\TEST*.xml" artifacts = "**\\build\\TEST*.out" - gox_flags = '-arch amd64' + gox_flags = '-arch 386' } deleteDir() diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 53c2707f4e01..4da4068bfb0b 100644 --- a/auditbeat/Jenkinsfile.yml +++ b/auditbeat/Jenkinsfile.yml @@ -47,6 +47,7 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" + #- "windows-7-32-bit" https://github.com/elastic/beats/issues/19831 #- "windows-2008-r2" https://github.com/elastic/beats/issues/19799 windows-2016: mage: "mage build unitTest" diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index e31dee8ccc90..658e3d60dbd3 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -68,4 +68,26 @@ stages: labels: - "windows-10" branches: true ## for all the branches - tags: true ## for all the tags \ No newline at end of file + 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 + 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 filebeat for windows-7-32" + labels: + - "windows-7-32" + branches: true ## for all the branches + tags: true ## for all the tags diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index 8c891804a3c4..d068a7798ad0 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -89,3 +89,25 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tag + 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 + 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 diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index 5b56c6d6338b..51d9de8e93f3 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -41,6 +41,7 @@ stages: platforms: ## override default labels in this specific stage. - "windows-2019" #- "windows-2008-r2" https://github.com/elastic/beats/issues/19800 + #- "windows-7-32-bit" https://github.com/elastic/beats/issues/19835 windows-2016: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index 417b0278f132..a75bbd3bf609 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -89,3 +89,25 @@ stages: - "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 packetbeat for windows-8" + labels: + - "windows-8" + 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 diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 45834e5f2b24..56427c4f19b4 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -42,7 +42,7 @@ stages: - "windows-2012" branches: true ## for all the branches tags: true ## for all the tags - # windows-10: See https://github.com/elastic/beats/issues/22046 + #windows-10: See https://github.com/elastic/beats/issues/22046 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. # - "windows-10" @@ -53,3 +53,25 @@ stages: # - "windows-10" # 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 + #windows-7-32: See https://github.com/elastic/beats/issues/19829 + # 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 diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 6c14dc249ad8..7e40a4047ad7 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -90,3 +90,25 @@ stages: - "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-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 1348b17b8259..890a2cbb4c4a 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -89,3 +89,25 @@ stages: - "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-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" + # when: ## Override the top-level when. + # comments: + # - "/test x-pack/elastic-agent 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/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml index cd42a01cbcb6..b3ef5fad8c38 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -90,3 +90,25 @@ stages: - "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-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" + # when: ## Override the top-level when. + # comments: + # - "/test x-pack/filebeat 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/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml index c63ed28cdf2e..184517642893 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -87,3 +87,25 @@ stages: - "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-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 ed5d12dd7c75..55c6819ba607 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -35,6 +35,7 @@ stages: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. - "windows-2019" + #- "windows-7-32-bit" https://github.com/elastic/beats/issues/19835 windows-2016: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 00a7c1c63332..08f666bc43ed 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -62,3 +62,25 @@ stages: - "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-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 0bb02dfbdef9..405ce1aa1d47 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -62,3 +62,25 @@ stages: - "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-32: See https://github.com/elastic/beats/issues/19829 + # 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 cd5cdbc21ffa6eb3f0e3130973525fe86046f3b8 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 2 Nov 2020 13:56:16 +0000 Subject: [PATCH 2/2] Windows-8 should be backported from another PR --- filebeat/Jenkinsfile.yml | 11 ----------- heartbeat/Jenkinsfile.yml | 11 ----------- packetbeat/Jenkinsfile.yml | 11 ----------- winlogbeat/Jenkinsfile.yml | 11 ----------- x-pack/auditbeat/Jenkinsfile.yml | 11 ----------- x-pack/elastic-agent/Jenkinsfile.yml | 11 ----------- x-pack/filebeat/Jenkinsfile.yml | 11 ----------- x-pack/functionbeat/Jenkinsfile.yml | 11 ----------- x-pack/packetbeat/Jenkinsfile.yml | 11 ----------- x-pack/winlogbeat/Jenkinsfile.yml | 11 ----------- 10 files changed, 110 deletions(-) diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml index 658e3d60dbd3..cfe25ab79c44 100644 --- a/filebeat/Jenkinsfile.yml +++ b/filebeat/Jenkinsfile.yml @@ -69,17 +69,6 @@ stages: - "windows-10" 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml index d068a7798ad0..af67c8a7c831 100644 --- a/heartbeat/Jenkinsfile.yml +++ b/heartbeat/Jenkinsfile.yml @@ -89,17 +89,6 @@ stages: - "windows-2008" branches: true ## for all the branches tags: true ## for all the tag - 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 windows-7-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml index a75bbd3bf609..1aee8c11a32e 100644 --- a/packetbeat/Jenkinsfile.yml +++ b/packetbeat/Jenkinsfile.yml @@ -89,17 +89,6 @@ stages: - "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 packetbeat for windows-8" - labels: - - "windows-8" - 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. diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index 56427c4f19b4..5cd9e3fd6e3b 100644 --- a/winlogbeat/Jenkinsfile.yml +++ b/winlogbeat/Jenkinsfile.yml @@ -53,17 +53,6 @@ stages: # - "windows-10" # 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 #windows-7-32: See https://github.com/elastic/beats/issues/19829 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage. diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml index 7e40a4047ad7..867020da489c 100644 --- a/x-pack/auditbeat/Jenkinsfile.yml +++ b/x-pack/auditbeat/Jenkinsfile.yml @@ -90,17 +90,6 @@ stages: - "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-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml index 890a2cbb4c4a..787c9acf10a7 100644 --- a/x-pack/elastic-agent/Jenkinsfile.yml +++ b/x-pack/elastic-agent/Jenkinsfile.yml @@ -89,17 +89,6 @@ stages: - "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-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 b3ef5fad8c38..7ff85ddcc773 100644 --- a/x-pack/filebeat/Jenkinsfile.yml +++ b/x-pack/filebeat/Jenkinsfile.yml @@ -90,17 +90,6 @@ stages: - "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-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 184517642893..718693d7ea26 100644 --- a/x-pack/functionbeat/Jenkinsfile.yml +++ b/x-pack/functionbeat/Jenkinsfile.yml @@ -87,17 +87,6 @@ stages: - "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-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml index 08f666bc43ed..9b181181d40b 100644 --- a/x-pack/packetbeat/Jenkinsfile.yml +++ b/x-pack/packetbeat/Jenkinsfile.yml @@ -62,17 +62,6 @@ stages: - "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-32: mage: "mage build unitTest" platforms: ## override default labels in this specific stage. diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml index 405ce1aa1d47..964105a2ea2b 100644 --- a/x-pack/winlogbeat/Jenkinsfile.yml +++ b/x-pack/winlogbeat/Jenkinsfile.yml @@ -62,17 +62,6 @@ stages: - "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-32: See https://github.com/elastic/beats/issues/19829 # mage: "mage build unitTest" # platforms: ## override default labels in this specific stage.