From df57277f6ef1cf329a1e19faf3f41c1d9ab0ae03 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 17 Apr 2026 10:46:09 +0200 Subject: [PATCH 1/2] ci: Allow requesting non-default JVMs or specific test JVMs jobs --- .gitlab-ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc3ff9d1277..7580978450a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -589,16 +589,20 @@ muzzle-dep-report: TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ddbuild.io/images/mirror/" JETTY_AVAILABLE_PROCESSORS: 4 # Jetty incorrectly calculates processor count in containers rules: - - if: $testJvm =~ $DEFAULT_TEST_JVMS - when: on_success - - if: $NON_DEFAULT_JVMS == "true" - when: on_success - - if: $CI_COMMIT_BRANCH == "master" + # Protected branches (master/mq/gh-readonly): all JVMs run unconditionally + - if: '$CI_COMMIT_BRANCH == "master"' when: on_success - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/' when: on_success - if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue/' when: on_success + # Enable for default test JVMs or for NON_DEFAULT_JVMS + - if: '$NON_DEFAULT_JVMS == "true"' + when: on_success + - if: '$CI_COMMIT_MESSAGE =~ /\[ci: NON_DEFAULT_JVMS\]/' + when: on_success + - if: '$testJvm =~ $DEFAULT_TEST_JVMS' + when: on_success script: - *gitlab_base_ref_params - > From 9a7cf4030664c82a4e0649e9393189c2cc93f684 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Fri, 17 Apr 2026 10:53:18 +0200 Subject: [PATCH 2/2] ci: Test All Jvms [ci: NON_DEFAULT_JVMS]