From 1c80605d56eaceea1008a5a09d50212aacef534e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 17 Oct 2024 13:57:19 +1000
Subject: [PATCH] CI: set the LITEST_JOBS in the template, not the script

Fixes: 70c57e964450 ("CI: drop the job count for the valgrind test suite to 2")
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1063>
---
 .gitlab-ci.yml         | 20 ++++++++++----------
 .gitlab-ci/ci.template |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c91931b5..18dc1900 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -524,11 +524,11 @@ freebsd:13.2@container-clean:
   variables:
     # remove the global --no-suite=hardware
     MESON_TEST_ARGS: ''
+    LITEST_JOBS: 4
   before_script:
     - if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi
     - echo "Testing $SUITES"
     - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
-    - export LITEST_JOBS="2"
 
 
 .fedora:40@test-suite-vm:
@@ -666,7 +666,7 @@ vm-valgrind-touchpad:
     - vm-touchpad
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -678,7 +678,7 @@ vm-valgrind-tap:
     - vm-tap
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -690,7 +690,7 @@ vm-valgrind-touchpad-buttons:
     - vm-touchpad-buttons
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -702,7 +702,7 @@ vm-valgrind-tablet:
     - vm-tablet
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -714,7 +714,7 @@ vm-valgrind-gestures-device:
     - vm-gestures-device
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -726,7 +726,7 @@ vm-valgrind-backends:
     - vm-backends
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -738,7 +738,7 @@ vm-valgrind-misc:
     - vm-misc
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -750,7 +750,7 @@ vm-valgrind-other devices:
     - vm-other devices
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
@@ -762,7 +762,7 @@ vm-valgrind-pointer:
     - vm-pointer
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index acaa3e42..7102d3c2 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -400,11 +400,11 @@ pre-commit-hooks:
   variables:
     # remove the global --no-suite=hardware
     MESON_TEST_ARGS: ''
+    LITEST_JOBS: 4
   before_script:
     - if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi
     - echo "Testing $SUITES"
     - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
-    - export LITEST_JOBS="2"
 
 
 {# qemu tests are only done for the latest version of any distribution #}
@@ -444,7 +444,7 @@ vm-valgrind-{{suite.name}}:
     - vm-{{suite.name}}
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
-    LITEST_JOBS: 4
+    LITEST_JOBS: 2
   retry:
     max: 2
   rules: