From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 3 Jul 2019 16:03:11 +0000 (+0200)
Subject: Use $KYUA_RESULT in kyua report-html invocation for unified file location
X-Git-Tag: v9.11.9~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9a3bf572f3d33fa5d577e76150b4664858e1308;p=thirdparty%2Fbind9.git

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 0728267e20b..acf95eb99d9 100644
--- 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