Use $KYUA_RESULT in kyua report-html invocation for unified file location

(cherry picked from commit a2a69725ef4ebff338d70069eeacf1612b5c72d2)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0728267e20b080248e9e22238f0de3fa3f37737d..acf95eb99d98864b77b753e5d77c34f1064c5f60 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,9 @@ variables:
   CCACHE_DIR: "/ccache"
   SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
 
+  # VirtualBox driver needs to set build_dir to "/builds" in gitlab-runner.toml
+  KYUA_RESULT: "$CI_PROJECT_DIR/kyua.results"
+
 stages:
   - precheck
   - build
@@ -147,16 +150,22 @@ stages:
     expire_in: "1 week"
     when: on_failure
 
+.kyua_report: &kyua_report_html |
+  kyua report-html \
+       --force \
+       --results-file "$KYUA_RESULT" \
+       --results-filter "" \
+       --output kyua_html
+
 .unit_test: &unit_test_job
   <<: *default_triggering_rules
   stage: test
   before_script:
-    - KYUA_RESULT="$(pwd)/kyua.results"
-    - bash -x util/prepare-softhsm2.sh
+    - *setup_softhsm
   script:
     - make unit
   after_script:
-    - kyua report-html --force --results-file kyua.results --results-filter "" --output kyua_html
+    - *kyua_report_html
   artifacts:
     paths:
       - kyua.log