From bcf37c937a367d6d2b608350600635d29a8c3b4e Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Mon, 8 Feb 2021 13:32:35 +0200 Subject: [PATCH] CI: expose test results as junit This allows Gitlab to show a detailed test report in a human friendly manner on a merge request page. The junit output depends on Meson 0.55, but Meson in CI is bumped to the latest release on Feb 15th. It is beneficial to use the newest possible Meson in CI even if we do not require it, so that we benefit from fixes, e.g. new warnings about accidentally using more recent Meson features than our minimum Meson version supports. Meson 0.57 is required for proper test names in the Gitlab report after switching the tests to TAP. See: https://github.com/mesonbuild/meson/issues/8316 Signed-off-by: Pekka Paalanen --- .gitlab-ci.yml | 4 +++- .gitlab-ci/debian-install.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af506e95..e5f004c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: variables: FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: '2020-09-30.0' + FDO_DISTRIBUTION_TAG: '2021-02-15.0' container_prep: @@ -79,6 +79,8 @@ container_prep: - build-*/meson-logs - build-*/weston-virtme - prefix-* + reports: + junit: build-*/meson-logs/testlog.junit.xml .build-native-meson-no-test: extends: .build-native diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 70dfa93c..c161dc21 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -94,7 +94,7 @@ apt-get -y --no-install-recommends install \ apt-get -y --no-install-recommends -t buster-backports install \ freerdp2-dev -pip3 install --user git+https://github.com/mesonbuild/meson.git@0.49 +pip3 install --user git+https://github.com/mesonbuild/meson.git@0.57.0 export PATH=$HOME/.local/bin:$PATH # for documentation pip3 install sphinx==2.1.0 --user