From 60e156bd8d975eaaf41dab3446b20e3396917d99 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 26 Jun 2019 10:11:01 +0200 Subject: [PATCH 1/2] Add pytest.xml files to reports --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dab9a4a..7877822 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,5 +31,8 @@ build_enabled: paths: - install - build/*/test_results/*/*.xunit.xml + - build/*/pytest.xml reports: - junit: build/*/test_results/*/*.xunit.xml + junit: + - build/*/test_results/*/*.xunit.xml + - build/*/pytest.xml From e5abbbaaaafcdddb9e210e17ab1932e5f0f86ac0 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 26 Jun 2019 10:16:09 +0200 Subject: [PATCH 2/2] Add rule to disabled build too --- .gitlab-ci.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7877822..6b45c55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,12 +16,15 @@ before_script: # script: # - colcon build --symlink-install --packages-up-to $PACKAGES_LIST # - colcon test --packages-select $PACKAGES_LIST -# artifacts: -# paths: -# - install -# - build/*/test_results/*/*.xunit.xml -# reports: -# junit: build/*/test_results/*/*.xunit.xml + # artifacts: + # paths: + # - install + # - build/*/test_results/*/*.xunit.xml + # - build/*/pytest.xml + # reports: + # junit: + # - build/*/test_results/*/*.xunit.xml + # - build/*/pytest.xml build_enabled: script: