From df35452a98e3268833c658714561fcbd7bdc40f7 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Fri, 5 May 2023 21:28:38 -0400
Subject: [PATCH] Variables should be getting merged, before_script wont

---
 .gitlab/templates.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab/templates.yml b/.gitlab/templates.yml
index db0a07df2f..790f6eafa2 100644
--- a/.gitlab/templates.yml
+++ b/.gitlab/templates.yml
@@ -17,11 +17,9 @@
 .unit_test:
   stage: test
   when: on_success
-  # We define this using a before script because GitLab cannot merge variable
-  # definitions across inheritance (so the variables block from this would disappear)
-  before_script:
-    - export BOOST_TEST_LOGGER='JUNIT,all,test_results.${TEST}.xml:HRF,warning'
-    - export CTEST_OUTPUT_ON_FAILURE=1
+  variables:
+    BOOST_TEST_LOGGER: 'JUNIT,all,test_results.${TEST}.xml:HRF,warning'
+    CTEST_OUTPUT_ON_FAILURE: 1
   script:
     - cd build/linux/qa
     - ctest -R qa_${TEST}