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

[8.4](backport #32173) Enable MacOS M1 stages in the CI on a weekly basis #33065

Closed
wants to merge 1 commit into from
Closed

[8.4](backport #32173) Enable MacOS M1 stages in the CI on a weekly basis #33065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions .ci/schedule-weekly.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ pipeline {
cron('H H(1-2) * * 0')
}
stages {
stage('Weekly beats builds') {
stage('Weekly beats builds for AWS') {
steps {
runBuilds(quietPeriodFactor: 1000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'])
runBuilds(quietPeriodFactor: 1000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'], parameters: [booleanParam(name: 'awsCloudTests', value: true)])
}
}
stage('Weekly beats builds for Orka M1') {
steps {
// There are some limitations with the number of concurrent macos m1 that can run in parallel
// let's only run for the `main` branch for the timebeing and wait to start a bit longer,
// so the previous stage for AWS validation can run further
runBuilds(quietPeriodFactor: 10000, branches: ['main'], parameters: [booleanParam(name: 'macosM1Test', value: true)])
}
}
}
Expand All @@ -36,7 +44,7 @@ def runBuilds(Map args = [:]) {

def quietPeriod = 0
branches.each { branch ->
build(quietPeriod: quietPeriod, job: "Beats/beats/${branch}", parameters: [booleanParam(name: 'awsCloudTests', value: true)], wait: false, propagate: false)
build(quietPeriod: quietPeriod, job: "Beats/beats/${branch}", parameters: args.parameters, wait: false, propagate: false)
// Increate the quiet period for the next iteration
quietPeriod += args.quietPeriodFactor
}
Expand Down
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pipeline {
booleanParam(name: 'runAllStages', defaultValue: false, description: 'Allow to run all stages.')
booleanParam(name: 'armTest', defaultValue: false, description: 'Allow ARM stages.')
booleanParam(name: 'macosTest', defaultValue: false, description: 'Allow macOS stages.')
booleanParam(name: 'macosM1Test', defaultValue: false, description: 'Allow macOS M1 stages.')
string(name: 'PYTEST_ADDOPTS', defaultValue: '', description: 'Additional options to pass to pytest. Use PYTEST_ADDOPTS="-k pattern" to only run tests matching the specified pattern. For retries you can use `--reruns 3 --reruns-delay 15`')
}
stages {
Expand Down
14 changes: 14 additions & 0 deletions auditbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
# Ignore as long as there are test failures, see https://github.com/elastic/beats/issues/33033
# macosM1:
# mage: "mage build unitTest"
# platforms: ## override default label in this specific stage.
# - "orka && darwin && aarch64"
# when: ## Override the top-level when.
# comments:
# - "/test auditbeat for macos-m1"
# labels:
# - "macos-m1"
# parameters:
# - "macosM1Test"
# tags: false ## for all the tags
# stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 additions & 0 deletions filebeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test filebeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 additions & 0 deletions heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test heartbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
14 changes: 14 additions & 0 deletions metricbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
# Ignore as long as there are test failures, see https://github.com/elastic/beats/issues/33035
# macosM1:
# mage: "mage build unitTest"
# platforms: ## override default label in this specific stage.
# - "orka && darwin && aarch64"
# when: ## Override the top-level when.
# comments:
# - "/test metricbeat for macos-m1"
# labels:
# - "macos-m1"
# parameters:
# - "macosM1Test"
# tags: false ## for all the tags
# stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 additions & 0 deletions packetbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test packetbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 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,6 +44,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test auditbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 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 @@ -49,6 +49,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test filebeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 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 @@ -44,6 +44,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test functonbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
46 changes: 46 additions & 0 deletions x-pack/heartbeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
<<<<<<< HEAD
# TODO: there are windows test failures already reported
# https://github.com/elastic/beats/issues/23957 and https://github.com/elastic/beats/issues/23958
# waiting for being fixed.
Expand Down Expand Up @@ -62,6 +63,51 @@ stages:
# platforms: ## override default labels in this specific stage.
# - "windows-8"
# stage: extended_win
=======
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test heartbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-2022"
stage: mandatory
windows-2019:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-2019"
stage: extended_win
windows-2016:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-2016"
stage: mandatory
windows-2012:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-2012-r2"
stage: extended_win
windows-10:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-10"
stage: extended_win
windows-8:
mage: "mage build test"
platforms: ## override default labels in this specific stage.
- "windows-8"
stage: extended_win
>>>>>>> 8839929db1 (Enable MacOS M1 stages in the CI on a weekly basis (#32173))
packaging-linux:
packaging-linux: "mage package"
e2e:
Expand Down
14 changes: 14 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 @@ -62,6 +62,20 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
# Ignore as long as there are test failures, see https://github.com/elastic/beats/issues/33036
# macosM1:
# mage: "mage build unitTest"
# platforms: ## override default label in this specific stage.
# - "orka && darwin && aarch64"
# when: ## Override the top-level when.
# comments:
# - "/test metricbeat for macos-m1"
# labels:
# - "macos-m1"
# parameters:
# - "macosM1Test"
# tags: false ## for all the tags
# stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 additions & 0 deletions x-pack/osquerybeat/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test osquerybeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
13 changes: 13 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 @@ -47,6 +47,19 @@ stages:
- "macosTest"
tags: true ## for all the tags
stage: extended
macosM1:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
- "orka && darwin && aarch64"
when: ## Override the top-level when.
comments:
- "/test packetbeat for macos-m1"
labels:
- "macos-m1"
parameters:
- "macosM1Test"
tags: false ## for all the tags
stage: extended
windows-2022:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down