jenkins-bot has submitted this change and it was merged.
Change subject: migrate phpunit macro for extension to shell script
......................................................................
migrate phpunit macro for extension to shell script
The mw-phpunit-allexts inline shell script macro is now replaced by
mw-run-phpunit-allexts.sh script published in integration/jenkins.git.
That repository is fetched on slaves under /srv/slave-scripts/.
Change-Id: Ice5fd14de294598b4cf05eef2a56851b56f415d7
---
M macro.yaml
M mediawiki-extensions.yaml
2 files changed, 4 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 8d0d1ad..73e06fc 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -254,14 +254,9 @@
- shell: 'php tests/phpunit/phpunit.php --log-junit junit-phpunit.xml'
- builder:
- name: mw-phpunit-allexts
+ name: mw-run-phpunit-allexts
builders:
- # We have to move to the tests/phpunit directory where suite.xml is
- # located or the relative paths referenced there will not get
- # resolved by PHPUnit.
- # The publishers are usually expecting the .xml file to be at the
- # root of the workspace, so make sure we use an absolute path.
- - shell: 'cd tests/phpunit && php phpunit.php --log-junit
"$WORKSPACE/junit-phpunit-allexts.xml" --testsuite extensions'
+ - shell: '/srv/slave-scripts/bin/mw-run-phpunit-allexts.sh'
# Junit XML file as generated by the phpunit ant target
- publisher:
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 84c8751..cda8269 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -55,7 +55,7 @@
- mw-setup-extension:
mwbranch: '{mwbranch}'
dependencies: '{dependencies}'
- - mw-phpunit-allexts
+ - mw-run-phpunit-allexts
# TODO, find ways to additionaly run tests for core but
# without extensions tests
publishers:
@@ -121,7 +121,7 @@
- mw-setup-extension:
mwbranch: 'master'
dependencies: '{dependencies}'
- - mw-phpunit-allexts
+ - mw-run-phpunit-allexts
publishers:
- junit:
results: 'junit*.xml'
--
To view, visit https://gerrit.wikimedia.org/r/89796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice5fd14de294598b4cf05eef2a56851b56f415d7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
