gitlab CI: prefill the junit conversion script from the gitlab environment

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index 4423897b5f20903ead3904364533c07ca07b9176..2a6390c5ddc8114ad4ff48be0ff2ace708fc3f2b 100755 (executable)
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -49,8 +49,6 @@ set -e
 # We need the glob for the testlog so that it picks up those suffixed by a
 # suite (e.g. testlog-valgrind.json)
 ./.gitlab-ci/meson-junit-report.py \
-       --project-name=libevdev \
-       --job-id="$CI_JOB_ID" \
        --output="$MESON_BUILDDIR/junit-$CI_JOB_NAME-report.xml" \
        "$MESON_BUILDDIR"/meson-logs/testlog*.json; \
 

diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py
index 94a9a61b14528e1b82565dc1b2bc8e3943306b86..d6d7864f39c11a8278b7f3e8f627571a33c73662 100755 (executable)
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -9,19 +9,26 @@
 import argparse
 import datetime
 import json
+import os
 import sys
 import xml.etree.ElementTree as ET
 
+
+default_name = os.getenv('CI_PROJECT_NAME', 'unknown')
+default_job_id = os.getenv('CI_JOB_ID', 'Unknown')
+default_branch = os.getenv('CI_COMMIT_REF_NAME', 'master')
+
+
 aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUnit report')
 aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='unknown')
+                     help='The project name (default: $CI_PROJECT_NAME)',
+                     default=default_name)
 aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default='Unknown')
+                     help='The job ID for the report (default: $CI_JOB_ID)',
+                     default=default_job_id)
 aparser.add_argument('--branch', metavar='NAME',
                      help='Branch of the project being tested',
-                     default='master')
+                     default=default_branch)
 aparser.add_argument('--output', metavar='FILE',
                      help='The output file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),