Skip to content

Commit e13fb4e

Browse files
faydefsarahchen6
andauthored
Revert "Disallow benchmarks on commit tag-triggered pipelines (#11987)" (#12139)
Revert "Disallow benchmarks on commit tag-triggered pipelines (#11987)" This reverts commit 7694abb. Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent 5f48c83 commit e13fb4e

1 file changed

Lines changed: 5 additions & 12 deletions

File tree

.gitlab/java-benchmark-configs.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
- if: '$POPULATE_CACHE'
44
when: never
55
- if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
6-
when: never
6+
when: manual
7+
allow_failure: true
78
- if: '$CI_COMMIT_BRANCH == "master"'
89
when: on_success
910
interruptible: false
@@ -22,7 +23,8 @@
2223
- if: '$POPULATE_CACHE'
2324
when: never
2425
- if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
25-
when: never
26+
when: manual
27+
allow_failure: true
2628
- if: '$CI_COMMIT_BRANCH == "master"'
2729
when: on_success
2830
interruptible: false
@@ -36,18 +38,9 @@
3638
interruptible: true
3739
allow_failure: true
3840

41+
# Ensure the tracer artifact publish finishes before the benchmark jobs start.
3942
linux-java-spring-petclinic-parallel:
4043
needs: ["publish-artifacts-to-s3"]
41-
rules:
42-
- if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/'
43-
when: never
44-
- if: '$CI_PIPELINE_SOURCE == "schedule"'
45-
when: on_success
46-
- if: '$CI_COMMIT_BRANCH == "master"'
47-
when: on_success
48-
interruptible: false
49-
- when: manual
50-
allow_failure: true
5144

5245
linux-java-insecure-bank-load-parallel:
5346
needs: ["publish-artifacts-to-s3"]

0 commit comments

Comments
 (0)