Skip to content

Update Jenkins plugin xunit: from 1.102 to 2.3.8 #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j-rivero merged 4 commits into from
Mar 10, 2020
Merged

Update Jenkins plugin xunit: from 1.102 to 2.3.8 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8170b9b
Update xunit plugin to version 2.3.8
Feb 26, 2020
feee3da
Add junit_family=xunit2 to colcon test to generate valid reports for …
Feb 28, 2020
a910ad4
Do not inject pytest-args to avoid conflicts with user configuration.…
Mar 2, 2020
0bb3e24
Use context manager for handling pytest.ini file
Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions job_templates/snippet/publisher_xunit.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<xunit plugin="xunit@@1.102">
<xunit plugin="xunit@@2.3.8">
<types>
@[for prefix in ['ws/build', 'work space/build space']]@
<CTestType>
Expand Down Expand Up @@ -34,19 +34,14 @@
<thresholds>
<org.jenkinsci.plugins.xunit.threshold.FailedThreshold>
<unstableThreshold>0</unstableThreshold>
<unstableNewThreshold></unstableNewThreshold>
<failureThreshold></failureThreshold>
<failureNewThreshold></failureNewThreshold>
</org.jenkinsci.plugins.xunit.threshold.FailedThreshold>
<org.jenkinsci.plugins.xunit.threshold.SkippedThreshold>
<unstableThreshold></unstableThreshold>
<unstableNewThreshold></unstableNewThreshold>
<failureThreshold></failureThreshold>
<failureNewThreshold></failureNewThreshold>
</org.jenkinsci.plugins.xunit.threshold.SkippedThreshold>
<org.jenkinsci.plugins.xunit.threshold.SkippedThreshold/>
</thresholds>
<thresholdMode>1</thresholdMode>
<extraConfiguration>
<testTimeMargin>3000</testTimeMargin>
<sleepTime>0</sleepTime>
<reduceLog>false</reduceLog>
</extraConfiguration>
<testDataPublishers class="empty-set"/>
</xunit>
4 changes: 4 additions & 0 deletions ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,10 @@ def build_and_test(args, job):

print('# BEGIN SUBSECTION: test')

# xunit2 format is needed to make Jenkins xunit plugin 2.x happy
with open('pytest.ini', 'w') as ini_file:
ini_file.write('[pytest]\njunit_family=xunit2')

test_cmd = [
args.colcon_script, 'test',
'--base-paths', '"%s"' % args.sourcespace,
Expand Down