Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] support windows-7-32 bits #19797

Merged
merged 25 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
be0e98a
[CI] support windows-7-32 bits
v1v Jul 9, 2020
b2e1996
[CI] Support mingw in 32 bits
v1v Jul 9, 2020
067fb58
ci: avoid duplicated strings
v1v Jul 9, 2020
3ad1a52
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Jul 9, 2020
de92936
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Jul 14, 2020
a823b84
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Sep 28, 2020
8328644
[CI] Support mingw in 32 bits
v1v Sep 28, 2020
1903b6f
[CI] Support Windows-7-32 in pipeline 2.0
v1v Sep 28, 2020
edd1e9b
Disable while https://github.com/elastic/beats/issues/19795 is open
v1v Sep 28, 2020
ef82e11
Disable while https://github.com/elastic/beats/issues/19831 is open
v1v Sep 28, 2020
a3b33b4
Disable while https://github.com/elastic/beats/issues/19835 is open
v1v Sep 28, 2020
b359f40
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Oct 15, 2020
d809966
Enable filebeat since https://github.com/elastic/beats/issues/19641 w…
v1v Oct 15, 2020
1ce1bc6
Update Jenkinsfile
v1v Oct 16, 2020
a776d4d
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Oct 29, 2020
546a12e
Support 32 bits windows PATH
v1v Oct 30, 2020
fb7e03d
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Oct 30, 2020
417ab53
Disable windows-7 build for winlogbeat. See https://github.com/elasti…
v1v Oct 30, 2020
adfcc0d
Disable windows-7 build for x-pack/winlogbeat. See https://github.com…
v1v Oct 30, 2020
fd85b5c
Disable windows-7-32 build for packetbeat. See https://github.com/ela…
v1v Oct 30, 2020
7f60fb1
Comment disabled stages
v1v Oct 30, 2020
fe17349
Disable windows-7-32 build for filebeats. See https://github.com/elas…
v1v Oct 30, 2020
57480ba
Disable windows-7-32 build for elastic-agent. See https://github.com/…
v1v Oct 30, 2020
6ab0f6c
Merge remote-tracking branch 'upstream/master' into feature/windows-7-32
v1v Oct 30, 2020
a3e7693
Disable x-pack/filebeat instead filebeat. See https://github.com/elas…
v1v Oct 30, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .ci/scripts/install-tools.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
set GOPATH=%WORKSPACE%
set MAGEFILE_CACHE=%WORKSPACE%\.magefile
set PATH=%WORKSPACE%\bin;C:\ProgramData\chocolatey\bin;C:\tools\mingw64\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 (
Expand Down Expand Up @@ -38,7 +44,8 @@ IF NOT EXIST C:\Python38\python.exe (
python --version
where python

IF NOT EXIST C:\tools\mingw64\bin\gcc.exe (
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 (
Expand Down
10 changes: 6 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,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'
mdelapenya marked this conversation as resolved.
Show resolved Hide resolved
}

deleteDir()
Expand Down
1 change: 1 addition & 0 deletions auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,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"
Expand Down
13 changes: 12 additions & 1 deletion filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,15 @@ stages:
labels:
- "windows-8"
branches: true ## for all the branches
tags: true ## for all the tags
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
11 changes: 11 additions & 0 deletions heartbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,14 @@ stages:
- "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
1 change: 1 addition & 0 deletions metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,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.
Expand Down
11 changes: 11 additions & 0 deletions packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,14 @@ stages:
- "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
13 changes: 12 additions & 1 deletion winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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"
Expand All @@ -58,6 +58,17 @@ stages:
# - "windows-10"
# 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
windows-8:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
11 changes: 11 additions & 0 deletions x-pack/auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/elastic-agent/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/filebeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/functionbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,14 @@ stages:
- "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
1 change: 1 addition & 0 deletions x-pack/metricbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,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.
Expand Down
11 changes: 11 additions & 0 deletions x-pack/packetbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/winlogbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,14 @@ stages:
- "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