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.

Sign up for GitHub

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-2012 in pipeline 2.0 #21338

Merged
merged 5 commits into from
Oct 14, 2020
Merged

[CI] Support Windows-2012 in pipeline 2.0 #21338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3026ca9
[CI] Support Windows-2012 in pipeline 2.0
v1v Sep 28, 2020
b3b7cb1
Merge remote-tracking branch 'upstream/master' into feature/windows-2…
v1v Oct 8, 2020
942ebc4
Merge remote-tracking branch 'upstream/master' into feature/windows-2…
v1v Oct 8, 2020
89f4b05
Fix merge conflict
v1v Oct 8, 2020
f95db3c
Add PATH since gcc is not in the default PATH in the workers
v1v Oct 8, 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
3 changes: 2 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,10 @@ def withBeatsEnv(Map args = [:], Closure body) {
artifacts = '**/build/TEST*.out'
} else {
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}"
path = "${env.WORKSPACE}\\bin;${goRoot}\\bin;${chocoPath};${chocoPython3Path};${env.PATH};${mingw64Path}"
magefile = "${env.WORKSPACE}\\.magefile"
testResults = "**\\build\\TEST*.xml"
artifacts = "**\\build\\TEST*.out"
Expand Down
11 changes: 11 additions & 0 deletions auditbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,14 @@ stages:
- "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 auditbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags
12 changes: 12 additions & 0 deletions heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,15 @@ stages:
- "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 heartbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags

11 changes: 11 additions & 0 deletions metricbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,14 @@ stages:
- "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 metricbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags
11 changes: 11 additions & 0 deletions packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,14 @@ stages:
- "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 packetbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags
11 changes: 11 additions & 0 deletions winlogbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,14 @@ stages:
- "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 winlogbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags
11 changes: 11 additions & 0 deletions x-pack/auditbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,14 @@ stages:
- "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 auditbeat for windows-2012"
labels:
- "windows-2012"
branches: true ## for all the branches
tags: true ## for all the tags
11 changes: 11 additions & 0 deletions x-pack/elastic-agent/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/functionbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/metricbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,14 @@ stages:
- "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
11 changes: 11 additions & 0 deletions x-pack/winlogbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,14 @@ stages:
- "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