From 693af4a65de396793b28d834affdefd767f03311 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 13 May 2026 15:34:58 -0400 Subject: [PATCH 1/3] Test sarahchen6/bring-back-comparisons branch --- .gitlab-ci.yml | 13 ++++++++----- .gitlab/java-benchmark-configs.yml | 5 ----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc62f758c87..0d6a8688d50 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: 'sarahchen6/update-java-pr-commenting-jobs' # TODO: revert to 'main' after apm-sdks-benchmarks PR merges + ref: 'sarahchen6/bring-back-comparisons' - local: ".gitlab/java-benchmark-configs.yml" stages: @@ -42,6 +43,8 @@ stages: - generate-signing-key variables: + # TODO: remove after apm-sdks-benchmarks PR merges + APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/bring-back-comparisons" # Gitlab runner features; see https://docs.gitlab.com/runner/configuration/feature-flags.html # Fold and time all script sections FF_SCRIPT_SECTIONS: 1 diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 64bee62b47e..b984847c6a0 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -65,8 +65,3 @@ linux-java-dacapo-parallel-1: linux-java-dacapo-parallel-2: needs: ["publish-artifacts-to-s3"] 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" From 566fd4e852cc8cdf142b7e2bcd480d961545df8b Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 13 May 2026 16:42:51 -0400 Subject: [PATCH 2/3] Override job branches --- .gitlab/java-benchmark-configs.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index b984847c6a0..fa603f49ae7 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -38,30 +38,54 @@ 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: + variables: + <<: *benchmark_branch_override From 234690e875cd49cbf28d9d2c8bb7fdff88dd3b43 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Thu, 14 May 2026 11:41:45 -0400 Subject: [PATCH 3/3] Separate PR-posting job --- .gitlab/java-benchmark-configs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index fa603f49ae7..0f8a0cf89ac 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -86,6 +86,10 @@ linux-java-dacapo-parallel-2: variables: <<: *benchmark_branch_override -java-post-pr-comment: +java-post-pr-comment-startup: + variables: + <<: *benchmark_branch_override + +java-post-pr-comment-load-dacapo: variables: <<: *benchmark_branch_override