Skip to content

Commit 97b8aa1

Browse files
eyalkorenv1v
andauthored
Enforcing correct CI workers for benchmarks (#2693)
* Adjusting benchmearks script to discover new core type * ci: use the right metal workers * ci: add ci:benchmarks tag support * ci: cleanup leftovers * Revert "Adjusting benchmearks script to discover new core type" This reverts commit 6059312. Co-authored-by: Victor Martinez <[email protected]>
1 parent cc55c45 commit 97b8aa1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ pipeline {
5555
booleanParam(name: 'end_to_end_tests_ci', defaultValue: false, description: 'Enable APM End-to-End tests')
5656

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

6061
// disabled by default, not required for merge
@@ -289,7 +290,7 @@ pipeline {
289290
* The result JSON files are also archive into Jenkins.
290291
*/
291292
stage('Benchmarks') {
292-
agent { label 'metal' }
293+
agent { label 'linux && metal' }
293294
options { skipDefaultCheckout() }
294295
environment {
295296
NO_BUILD = "true"
@@ -300,6 +301,7 @@ pipeline {
300301
anyOf {
301302
branch 'main'
302303
expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
304+
expression { matchesPrLabel(label: 'ci:benchmarks') }
303305
expression { return params.bench_ci }
304306
}
305307
}
@@ -315,6 +317,9 @@ pipeline {
315317
}
316318
}
317319
post {
320+
cleanup {
321+
deleteDir()
322+
}
318323
always {
319324
archiveArtifacts(allowEmptyArchive: true,
320325
artifacts: "${BASE_DIR}/${RESULT_FILE}",

0 commit comments

Comments
 (0)