From 8f6e7301008acb67ec74b9558c4e61a4747baebf Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 17 Jul 2026 13:45:10 -0400 Subject: [PATCH 1/2] Disallow benchmarks on commit tag pushes --- .gitlab/java-benchmark-configs.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 8df9511b52d..61199cb4ec1 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -3,8 +3,7 @@ - if: '$POPULATE_CACHE' when: never - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/' - when: manual - allow_failure: true + when: never - if: '$CI_COMMIT_BRANCH == "master"' when: on_success interruptible: false @@ -23,8 +22,7 @@ - if: '$POPULATE_CACHE' when: never - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/' - when: manual - allow_failure: true + when: never - if: '$CI_COMMIT_BRANCH == "master"' when: on_success interruptible: false @@ -38,9 +36,18 @@ 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"] + rules: + - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/' + when: never + - if: '$CI_PIPELINE_SOURCE == "schedule"' + when: always + - if: '$CI_COMMIT_BRANCH == "master"' + when: always + interruptible: false + - when: manual + allow_failure: true linux-java-insecure-bank-load-parallel: needs: ["publish-artifacts-to-s3"] From 9cd0b67e40985a508622dc60b33b278d6cd366a1 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Fri, 17 Jul 2026 15:29:18 -0400 Subject: [PATCH 2/2] Run petclinic benchmarks on_success --- .gitlab/java-benchmark-configs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 61199cb4ec1..2d7c3727e9e 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -42,9 +42,9 @@ linux-java-spring-petclinic-parallel: - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/' when: never - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: always + when: on_success - if: '$CI_COMMIT_BRANCH == "master"' - when: always + when: on_success interruptible: false - when: manual allow_failure: true