From 46ed9e53e4faf4c987640f4fe0fa048bad1fc073 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Jan 2023 16:25:03 +1000 Subject: gitlab CI: drop the custom meson to junit conversion script And always collect test logs, makes it easier to debug when things fail to go wrong Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 4 +- .gitlab-ci/ci.template | 4 +- .gitlab-ci/meson-build.sh | 6 -- .gitlab-ci/meson-junit-report.py | 128 --------------------------------------- 4 files changed, 4 insertions(+), 138 deletions(-) delete mode 100755 .gitlab-ci/meson-junit-report.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3ed292..c27771a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,9 +44,9 @@ variables: - _build/test/test-suite.log - $MESON_BUILDDIR/meson-logs/ expire_in: 1 week - when: on_failure + when: always reports: - junit: $MESON_BUILDDIR/junit-*.xml + junit: $MESON_BUILDDIR/*junit*.xml .autotools_build: extends: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 7444106..4d7bf00 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -40,9 +40,9 @@ variables: - _build/test/test-suite.log - $MESON_BUILDDIR/meson-logs/ expire_in: 1 week - when: on_failure + when: always reports: - junit: $MESON_BUILDDIR/junit-*.xml + junit: $MESON_BUILDDIR/*junit*.xml .autotools_build: extends: diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index 2a6390c..1ed1923 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -46,10 +46,4 @@ meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS --print-errorlogs exit_code=$? 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 \ - --output="$MESON_BUILDDIR/junit-$CI_JOB_NAME-report.xml" \ - "$MESON_BUILDDIR"/meson-logs/testlog*.json; \ - exit $exit_code diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py deleted file mode 100755 index d6d7864..0000000 --- a/.gitlab-ci/meson-junit-report.py +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/env python3 -# -# meson-junit-report.py: Turns a Meson test log into a JUnit report -# -# Copyright 2019 GNOME Foundation -# -# SPDX-License-Identifier: LGPL-2.1-or-later - -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: $CI_PROJECT_NAME)', - default=default_name) -aparser.add_argument('--job-id', metavar='ID', - 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=default_branch) -aparser.add_argument('--output', metavar='FILE', - help='The output file, stdout by default', - type=argparse.FileType('w', encoding='UTF-8'), - default=sys.stdout) -aparser.add_argument('infile', metavar='FILE', - help='The input testlog.json, stdin by default', - type=argparse.FileType('r', encoding='UTF-8'), - default=sys.stdin) - -args = aparser.parse_args() - -outfile = args.output - -testsuites = ET.Element('testsuites') -testsuites.set('id', '{}/{}'.format(args.job_id, args.branch)) -testsuites.set('package', args.project_name) -testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes')) - -suites = {} -for line in args.infile: - data = json.loads(line) - (full_suite, unit_name) = data['name'].split(' / ') - (project_name, suite_name) = full_suite.split(':') - - duration = data['duration'] - return_code = data['returncode'] - log = data['stdout'] - - unit = { - 'suite': suite_name, - 'name': unit_name, - 'duration': duration, - 'returncode': return_code, - 'stdout': log, - } - - units = suites.setdefault(suite_name, []) - units.append(unit) - -for name, units in suites.items(): - print('Processing suite {} (units: {})'.format(name, len(units))) - - def if_failed(unit): - if not if_skipped(unit) and unit['returncode'] != 0: - return True - return False - - def if_skipped(unit): - if unit['returncode'] == 77: - return True - return False - - def if_succeded(unit): - if unit['returncode'] == 0: - return True - return False - - successes = list(filter(if_succeded, units)) - failures = list(filter(if_failed, units)) - skips = list(filter(if_skipped, units)) - print(' - {}: {} pass, {} fail, {} skipped'.format(name, len(successes), len(failures), len(skips))) - - testsuite = ET.SubElement(testsuites, 'testsuite') - testsuite.set('name', '{}/{}'.format(args.project_name, name)) - testsuite.set('tests', str(len(units))) - testsuite.set('errors', str(len(failures))) - testsuite.set('skipped', str(len(skips))) - testsuite.set('failures', str(len(failures))) - - for unit in successes: - testcase = ET.SubElement(testsuite, 'testcase') - testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite'])) - testcase.set('name', unit['name']) - testcase.set('time', str(unit['duration'])) - - for unit in skips: - testcase = ET.SubElement(testsuite, 'testcase') - testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite'])) - testcase.set('name', unit['name']) - testcase.set('time', str(unit['duration'])) - - skip = ET.SubElement(testcase, 'skipped') - - for unit in failures: - testcase = ET.SubElement(testsuite, 'testcase') - testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite'])) - testcase.set('name', unit['name']) - testcase.set('time', str(unit['duration'])) - - failure = ET.SubElement(testcase, 'failure') - failure.set('classname', '{}/{}'.format(args.project_name, unit['suite'])) - failure.set('name', unit['name']) - failure.set('type', 'error') - failure.text = unit['stdout'] - -output = ET.tostring(testsuites, encoding='unicode') -outfile.write(output) -- cgit v1.2.3