Skip to content

Commit 52c2ac6

Browse files
authored
Migrate benchmarks to Merge Queue (#10526)
Run dacapo/load/startup benchmarks on merge queue and manually Apply to parallel benchmarks as well Merge branch 'master' into sarahchen6/move-benchmarks-to-mq Fix slash Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent b8e3bd6 commit 52c2ac6

2 files changed

Lines changed: 41 additions & 3 deletions

File tree

.gitlab/benchmarks.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
- if: '$CI_COMMIT_BRANCH == "master"'
1414
when: on_success
1515
interruptible: false
16-
- when: on_success
16+
- if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
17+
when: on_success
18+
interruptible: false
19+
- if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//'
20+
when: on_success
21+
interruptible: false
22+
- when: manual
23+
allow_failure: true
1724
interruptible: true
1825
script:
1926
- export ARTIFACTS_DIR="$(pwd)/reports" && mkdir -p "${ARTIFACTS_DIR}"
@@ -83,9 +90,14 @@ check-big-regressions:
8390
when: never
8491
- if: '$CI_COMMIT_BRANCH =~ /backport-pr-/'
8592
when: never
86-
- if: '$CI_COMMIT_BRANCH !~ /^(master|release\/)/'
93+
- if: '$CI_COMMIT_BRANCH =~ /^(master|release\/)/'
94+
when: never
95+
- if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
96+
when: on_success
97+
- if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//'
8798
when: on_success
88-
- when: never
99+
- when: manual
100+
allow_failure: true
89101
# ARTIFACTS_DIR /go/src/github.com/DataDog/apm-reliability/dd-trace-java/reports/
90102
# need to convert them
91103
script:

.gitlab/java-benchmark-configs.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,47 @@
1+
# Benchmarks run on master, merge queue, or when manually triggered.
2+
.parallel_benchmark_rules: &parallel_benchmark_rules
3+
- if: '$POPULATE_CACHE'
4+
when: never
5+
- if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
6+
when: manual
7+
allow_failure: true
8+
- if: '$CI_COMMIT_BRANCH == "master"'
9+
when: on_success
10+
interruptible: false
11+
- if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
12+
when: on_success
13+
interruptible: true
14+
- if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//'
15+
when: on_success
16+
interruptible: true
17+
- when: manual
18+
interruptible: true
19+
allow_failure: true
20+
121
# Ensure the tracer artifact publish finishes before the benchmark jobs start.
222
linux-java-spring-petclinic-parallel:
323
needs: ["publish-artifacts-to-s3"]
424

525
linux-java-insecure-bank-load-parallel:
626
needs: ["publish-artifacts-to-s3"]
27+
rules: *parallel_benchmark_rules
728

829
linux-java-spring-petclinic-load-parallel:
930
needs: ["publish-artifacts-to-s3"]
31+
rules: *parallel_benchmark_rules
1032

1133
linux-java-insecure-bank-startup-parallel:
1234
needs: ["publish-artifacts-to-s3"]
35+
rules: *parallel_benchmark_rules
1336

1437
linux-java-spring-petclinic-startup-parallel:
1538
needs: ["publish-artifacts-to-s3"]
39+
rules: *parallel_benchmark_rules
1640

1741
linux-java-dacapo-parallel-1:
1842
needs: ["publish-artifacts-to-s3"]
43+
rules: *parallel_benchmark_rules
1944

2045
linux-java-dacapo-parallel-2:
2146
needs: ["publish-artifacts-to-s3"]
47+
rules: *parallel_benchmark_rules

0 commit comments

Comments
 (0)