Skip to content

Enforcing correct CI workers for benchmarks #2693

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

Merged
merged 5 commits into from
Jul 6, 2022
Merged

Enforcing correct CI workers for benchmarks #2693

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6059312
Adjusting benchmearks script to discover new core type
eyalkoren Jul 4, 2022
a4fca73
ci: use the right metal workers
v1v Jul 5, 2022
c4d6d39
ci: add ci:benchmarks tag support
v1v Jul 5, 2022
047f06c
ci: cleanup leftovers
v1v Jul 5, 2022
945a2b7
Revert "Adjusting benchmearks script to discover new core type"
v1v Jul 5, 2022
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
7 changes: 6 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pipeline {
booleanParam(name: 'end_to_end_tests_ci', defaultValue: false, description: 'Enable APM End-to-End tests')

// disabled by default, not required for merge
// opt-in with 'ci:benchmarks' tag on PR
booleanParam(name: 'bench_ci', defaultValue: false, description: 'Enable benchmarks')

// disabled by default, not required for merge
Expand Down Expand Up @@ -289,7 +290,7 @@ pipeline {
* The result JSON files are also archive into Jenkins.
*/
stage('Benchmarks') {
agent { label 'metal' }
agent { label 'linux && metal' }
options { skipDefaultCheckout() }
environment {
NO_BUILD = "true"
Expand All @@ -300,6 +301,7 @@ pipeline {
anyOf {
branch 'main'
expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
expression { matchesPrLabel(label: 'ci:benchmarks') }
expression { return params.bench_ci }
}
}
Expand All @@ -315,6 +317,9 @@ pipeline {
}
}
post {
cleanup {
deleteDir()
}
always {
archiveArtifacts(allowEmptyArchive: true,
artifacts: "${BASE_DIR}/${RESULT_FILE}",
Expand Down