From 1407ff2f51fb9545c6f3818dd9844728ff7c4805 Mon Sep 17 00:00:00 2001
From: Stuart Clark <stu@rtclark.net>
Date: Tue, 6 Oct 2026 05:14:55 +0000
Subject: [PATCH] ci: run phpunit concurrently on Drupal.org with
 gitlab_templates 1.17.0

---
 .gitlab-ci.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5717157..26e7b4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,14 @@ include:
 ################
 variables:
   SKIP_ESLINT: '1'
+  # The phpunit binary (_PHPUNIT_CONCURRENT: 0) loads phpunit.xml from the
+  # project root. That file is the scaffold config for local and GitHub runs.
+  # This flag points the binary at the DrupalCI config instead.
   _PHPUNIT_EXTRA: '--no-coverage --configuration=phpunit.gitlab-ci.xml'
-  # gitlab_templates 1.17.0 made run-tests.sh the default. Keep the phpunit binary.
-  _PHPUNIT_CONCURRENT: 0
+  # run-tests.sh (_PHPUNIT_CONCURRENT: 1, the default) uses core's phpunit
+  # config and needs no extra options. The '-' stops the template copying
+  # _PHPUNIT_EXTRA into this variable.
+  _RUNTESTS_EXTRA: '-'
   _CSPELL_WORDS: 'cloudflared, cleanstring, ctools, dpagini, ffpu, multiext, oleh, origname, pagini, vehera, voleger, тест'
   OPT_IN_TEST_PREVIOUS_MAJOR: '1'