diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5290d93abd0..a0532bdc7aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,21 +3,22 @@ include: - local: ".gitlab/benchmarks.yml" - local: ".gitlab/exploration-tests.yml" - local: ".gitlab/ci-visibility-tests.yml" + # TODO: revert all refs to 'main' after apm-sdks-benchmarks PR merges - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-spring-petclinic-parallel.yml' - ref: 'main' + ref: 'sarahchen6/bring-back-comparisons' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-load-parallel.yml' - ref: 'main' + ref: 'sarahchen6/bring-back-comparisons' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-startup-parallel.yml' - ref: 'main' + ref: 'sarahchen6/bring-back-comparisons' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-dacapo-parallel.yml' - ref: 'main' + ref: 'sarahchen6/bring-back-comparisons' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-post-pr-comment.yml' - ref: 'main' + ref: 'sarahchen6/bring-back-comparisons' - local: ".gitlab/java-benchmark-configs.yml" stages: diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index b984847c6a0..0f8a0cf89ac 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -38,30 +38,58 @@ interruptible: true allow_failure: true +# TODO: remove APM_SDKS_BENCHMARKS_BRANCH overrides after apm-sdks-benchmarks PR merges. +# Job-level variables override the template default ("main") which otherwise takes +# precedence over the pipeline-level variable. +.benchmark_branch_override: &benchmark_branch_override + APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/bring-back-comparisons" + # Ensure the tracer artifact publish finishes before the benchmark jobs start. linux-java-spring-petclinic-parallel: needs: ["publish-artifacts-to-s3"] + variables: + <<: *benchmark_branch_override linux-java-insecure-bank-load-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-spring-petclinic-load-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-insecure-bank-startup-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_startup_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-spring-petclinic-startup-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_startup_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-dacapo-parallel-1: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-dacapo-parallel-2: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override + +java-post-pr-comment-startup: + variables: + <<: *benchmark_branch_override + +java-post-pr-comment-load-dacapo: + variables: + <<: *benchmark_branch_override