Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/92619


Change subject:  Path to PHPUnit as deployed by Wikimedia deployment system.
......................................................................

Path to PHPUnit as deployed by Wikimedia deployment system.

The path is passed to MediaWiki php wrapper using --with-phpunitdir.  It
should match a local checkout of integration/phpunit.git repository
which contains PHPUnit as it is installed by Composer. The local copy
should be deployed on all slaves via the role::ci::slave puppet class
includes: deployment::target { # 'contint-production-slaves': }

Impacts the jobs:

mediawiki-core-phpunit-api
mediawiki-core-phpunit-databaseless
mediawiki-core-phpunit-misc
mediawiki-core-phpunit-parser
mediawiki-core-regression-REL1_19
mediawiki-core-regression-REL1_20
mediawiki-core-regression-REL1_21
mediawiki-core-regression-REL1_22
mediawiki-core-regression-master

Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
---
M bin/mw-run-phpunit.sh
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/19/92619/1

diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index abac3e5..f04edd0 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -23,6 +23,15 @@
 # - Stub : not implemented tests
 PHPUNIT_EXCLUDE_GROUP="Broken,ParserFuzz,Stub"
 
+# Path to PHPUnit as deployed by Wikimedia deployment system.
+#
+# The path is passed to MediaWiki php wrapper using --with-phpunitdir. It
+# should match a local checkout of integration/phpunit.git repository which
+# contains PHPUnit as it is installed by Composer. The local copy should be
+# deployed on all slaves via the role::ci::slave puppet class includes:
+# deployment::target { # 'contint-production-slaves': }
+PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
+
 # Setup Junit destination
 LOG_DIR="$WORKSPACE/log"
 mkdir -p "$LOG_DIR"
@@ -79,7 +88,9 @@
 
 set -x
 cd "${WORKSPACE}/tests/phpunit"
-php phpunit.php $PHPUNIT_GROUP_OPT \
+php phpunit.php \
+       --with-phpunitdir "$PHPUNIT_DIR" \
+       $PHPUNIT_GROUP_OPT \
        --exclude-group "$PHPUNIT_EXCLUDE_GROUP" \
        --conf "$WORKSPACE/LocalSettings.php" \
        --log-junit $JUNIT_DEST

-- 
To view, visit https://gerrit.wikimedia.org/r/92619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8651f2fb0e09d4e868c2139b5a7d1b640de61784
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to