Test apm-sdks-benchmarks branch changes

.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

.gitlab/java-benchmark-configs.yml

@@ -38,35 +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:
+java-post-pr-comment-load-dacapo:
   variables:
-    # TODO: revert to "main" after apm-sdks-benchmarks PR merges
-    APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/update-java-pr-commenting-jobs"
+    <<: *benchmark_branch_override