Merge ~adam-collard/maas-ci:junit-systemtests into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Merged at revision: 2836fb91071410b06c3c42cc8d45d74fbf787e19
Proposed branch: ~adam-collard/maas-ci:junit-systemtests
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 22 lines (+2/-1)
2 files modified
.gitignore (+1/-0)
pytest.ini (+1/-1)
Reviewer Review Type Date Requested Status
Björn Tillenius Approve
Review via email: mp+396985@code.launchpad.net

Commit message

Add junit output to systemtests

To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.gitignore b/.gitignore
index a94b0c8..140cb23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ __pycache__
2*.egg-info2*.egg-info
3config.yaml3config.yaml
4systemtests.log4systemtests.log
5junit.xml
5.tox6.tox
6sosreport7sosreport
diff --git a/pytest.ini b/pytest.ini
index 1d080e4..8f15c44 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
1[pytest]1[pytest]
2addopts = --strict-markers -v --durations=102addopts = --strict-markers -v --durations=10 --junitxml=junit.xml
3markers =3markers =
4 skip_if_maas_earlier: Skips tests if the MAAS version is earlier than the specified one4 skip_if_maas_earlier: Skips tests if the MAAS version is earlier than the specified one
5 skip_if_maas_onwards: Skips tests if the MAAS version the same or newer than the specified one5 skip_if_maas_onwards: Skips tests if the MAAS version the same or newer than the specified one

Subscribers

People subscribed via source and target branches

to all changes: