Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include:
ref: 'main'
- project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
file: '.gitlab/ci-java-post-pr-comment.yml'
ref: 'main'
ref: 'sarahchen6/update-java-pr-commenting-jobs' # TODO: revert to 'main' after apm-sdks-benchmarks PR merges
- local: ".gitlab/java-benchmark-configs.yml"

stages:
Expand Down
36 changes: 26 additions & 10 deletions .gitlab/java-benchmark-configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
interruptible: true
allow_failure: true

# Startup benchmarks run on PRs as well
.parallel_startup_benchmark_rules: &parallel_startup_benchmark_rules
- if: '$POPULATE_CACHE'
when: never
- if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
when: manual
allow_failure: true
- if: '$CI_COMMIT_BRANCH == "master"'
when: on_success
interruptible: false
- if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
when: on_success
interruptible: true
- if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//'
when: on_success
interruptible: true
- when: on_success
interruptible: true
allow_failure: true

# Ensure the tracer artifact publish finishes before the benchmark jobs start.
linux-java-spring-petclinic-parallel:
needs: ["publish-artifacts-to-s3"]
Expand All @@ -32,11 +52,11 @@ linux-java-spring-petclinic-load-parallel:

linux-java-insecure-bank-startup-parallel:
needs: ["publish-artifacts-to-s3"]
rules: *parallel_benchmark_rules
rules: *parallel_startup_benchmark_rules

linux-java-spring-petclinic-startup-parallel:
needs: ["publish-artifacts-to-s3"]
rules: *parallel_benchmark_rules
rules: *parallel_startup_benchmark_rules

linux-java-dacapo-parallel-1:
needs: ["publish-artifacts-to-s3"]
Expand All @@ -46,11 +66,7 @@ linux-java-dacapo-parallel-2:
needs: ["publish-artifacts-to-s3"]
rules: *parallel_benchmark_rules

java-startup-parallel-check-slo-breaches:
rules: *parallel_benchmark_rules

java-load-parallel-check-slo-breaches:
rules: *parallel_benchmark_rules

java-dacapo-parallel-check-slo-breaches:
rules: *parallel_benchmark_rules
java-post-pr-comment:
variables:
# TODO: revert to "main" after apm-sdks-benchmarks PR merges
APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/update-java-pr-commenting-jobs"