diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5290d93abd0..cc62f758c87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 4ae8993ce0c..64bee62b47e 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -18,6 +18,26 @@ interruptible: true allow_failure: true +# Startup benchmarks run on PRs as well +.parallel_startup_benchmark_rules: ¶llel_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"] @@ -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"] @@ -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"