Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58288
Change subject: factorized PHPUnit publisher in a macro
......................................................................
factorized PHPUnit publisher in a macro
The 'phpunit-junit' publisher macro abstract out a definition that was
used for both mediawiki/core and operations/mediawiki-config.
Change-Id: I3eb432c8436b269439932f4adf7a23035db5dae0
---
M macro.yaml
M mediawiki.yaml
M operations-mw-config.yaml
3 files changed, 11 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/88/58288/1
diff --git a/macro.yaml b/macro.yaml
index 7691f0f..7b8b331 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -206,6 +206,15 @@
# - shell: 'php tests/phpunit/phpunit.php --log-junit
junit-phpunit-allexts.xml --testsuite extensions'
- shell: 'php tests/phpunit/phpunit.php --log-junit
junit-phpunit-allexts.xml -- extensions'
+# Junit XML file as generated by the phpunit ant target
+- publisher:
+ name: phpunit-junit
+ publishers:
+ - xunit:
+ types:
+ - phpunit:
+ pattern: 'logs/junit.xml'
+
# Python pep8 builder - copied from OpenStack project
- builder:
name: pep8
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 98f2db2..b3a6ca9 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -119,22 +119,7 @@
- zuul
publishers:
- - xunit:
- thresholdmode: 'percent'
- thresholds:
- - failed:
- unstable: 0
- unstablenew: 0
- failure: 0
- failurenew: 0
- - skipped:
- unstable: 0
- unstablenew: 0
- failure: 0
- failurenew: 0
- types:
- - phpunit:
- pattern: 'logs/junit.xml'
+ - phpunit-junit
builders:
- ant:
targets: "phpunit-{phpunit-group}"
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 31c51f0..05ba05f 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -6,10 +6,7 @@
builders:
- shell: 'phpunit --log-junit logs/junit.xml'
publishers:
- - xunit:
- types:
- - phpunit:
- pattern: 'logs/junit.xml'
+ - phpunit-junit
- project:
name: 'operations-mw-config'
--
To view, visit https://gerrit.wikimedia.org/r/58288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb432c8436b269439932f4adf7a23035db5dae0
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
