diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-05 20:01:06 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-05 20:01:06 +0000 |
commit | 6f6ea512906422e84fc0ad11c2f034fff8180e05 (patch) | |
tree | d16db3fea9c2693d88daa5fa83a01d2f8bec5768 | |
parent | 11428fb869bff579e249ec1f187e4a9117a18c01 (diff) | |
parent | f756c3b8a0bfd89450b57b03e503fc3fec3480c6 (diff) | |
download | gtk+-6f6ea512906422e84fc0ad11c2f034fff8180e05.tar.gz |
Merge branch 'wip/ebassi/ci-junit-report' into 'master'
ci: Add JUnit report for the test suite
See merge request GNOME/gtk!718
-rw-r--r-- | .gitlab-ci.yml | 44 | ||||
-rwxr-xr-x | .gitlab-ci/meson-junit-report.py | 101 | ||||
-rwxr-xr-x | .gitlab-ci/test-docker.sh | 14 |
3 files changed, 152 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a29a7d52b0..f7b81247d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,14 @@ fedora-x86_64: script: - bash -x ./.gitlab-ci/test-docker.sh artifacts: - when: on_failure + when: always + reports: + junit: + - "${CI_PROJECT_DIR}/_build/report.xml" name: "gtk-${CI_COMMIT_REF_NAME}" paths: - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/report.xml" cache: key: "$CI_JOB_NAME" <<: *cache-paths @@ -53,20 +57,46 @@ msys2-mingw32: script: - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}" -flatpak:demo: +# Manual jobs, for branches and MRs +.flatpak-manual: &flatpak-manual + <<: *flatpak-defaults + when: manual + +# Only build Flatpak bundles automatically on master +.flatpak-master: &flatpak-master + <<: *flatpak-defaults + only: + - master + +flatpak-manual:demo: variables: APPID: org.gtk.Demo4 - <<: *flatpak-defaults + <<: *flatpak-manual + +flatpak-master:demo: + variables: + APPID: org.gtk.Demo4 + <<: *flatpak-master -flatpak:widget-factory: +flatpak-manual:widget-factory: variables: APPID: org.gtk.WidgetFactory4 - <<: *flatpak-defaults + <<: *flatpak-manual + +flatpak-master:widget-factory: + variables: + APPID: org.gtk.WidgetFactory4 + <<: *flatpak-master -flatpak:icon-browser: +flatpak-manual:icon-browser: variables: APPID: org.gtk.IconBrowser4 - <<: *flatpak-defaults + <<: *flatpak-manual + +flatpak-master:icon-browser: + variables: + APPID: org.gtk.IconBrowser4 + <<: *flatpak-master pages: image: registry.gitlab.gnome.org/gnome/gtk/master:v3 diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py new file mode 100755 index 0000000000..afc5d53c44 --- /dev/null +++ b/.gitlab-ci/meson-junit-report.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 + +import argparse +import datetime +import json +import os +import sys +import xml.etree.ElementTree as ET + +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') +aparser.add_argument('--job-id', metavar='ID', + help='The job ID for the report', + default='Unknown') +aparser.add_argument('--branch', metavar='NAME', + help='Branch of the project being tested', + default='master') +aparser.add_argument('--output', metavar='FILE', + help='The output file, stdout by default', + type=argparse.FileType('w'), + default=sys.stdout) +aparser.add_argument('infile', metavar='FILE', + help='The input testlog.json, stdin by default', + type=argparse.FileType('r'), + 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 unit['returncode'] != 0: + 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)) + print(' - {}: {} pass, {} fail'.format(name, len(successes), len(failures))) + + 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('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 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) diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh index 17cc7f7313..c070ada43d 100755 --- a/.gitlab-ci/test-docker.sh +++ b/.gitlab-ci/test-docker.sh @@ -24,6 +24,8 @@ cd _build ninja ccache --show-stats +set +e + xvfb-run -a -s "-screen 0 1024x768x24" \ meson test \ --timeout-multiplier 2 \ @@ -32,3 +34,15 @@ xvfb-run -a -s "-screen 0 1024x768x24" \ --no-suite=gtk:gsk \ --no-suite=gtk:reftest \ --no-suite=gtk:a11y + +# Save the exit code +exit_code=$? + +# We always want to run the report generator +$srcdir/.gitlab-ci/meson-junit-report.py \ + --project-name=gtk \ + --job-id="${CI_JOB_NAME}" \ + --output=report.xml \ + meson-logs/testlog.json + +exit $exit_code |