Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92623
Change subject: Extensions point to PHPUnit deployed by WMF deployment system
......................................................................
Extensions point to PHPUnit deployed by WMF deployment system
See 313d629
Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
---
M bin/mw-run-phpunit-allexts.sh
M bin/mw-run-phpunit.sh
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/23/92623/1
diff --git a/bin/mw-run-phpunit-allexts.sh b/bin/mw-run-phpunit-allexts.sh
index bb8acb8..cc7ac96 100755
--- a/bin/mw-run-phpunit-allexts.sh
+++ b/bin/mw-run-phpunit-allexts.sh
@@ -10,6 +10,9 @@
mkdir -p "$LOG_DIR"
JUNIT_DEST="$LOG_DIR/junit-phpunit-allexts.xml"
+# See documentation in mw-run-phpunit.sh
+PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
+
# Make sure to compress MediaWiki log dir after phpunit has ran
function compress_log_dir() {
echo "Compressing logs under $LOG_DIR"
@@ -24,4 +27,7 @@
# of the workspace, so make sure we use an absolute path.
cd "$WORKSPACE/tests/phpunit"
-php phpunit.php --log-junit "$JUNIT_DEST" --testsuite extensions
+php phpunit.php \
+ --with-phpunitdir "$PHPUNIT_DIR" \
+ --log-junit "$JUNIT_DEST" \
+ --testsuite extensions
diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh
index f04edd0..4cb9734 100755
--- a/bin/mw-run-phpunit.sh
+++ b/bin/mw-run-phpunit.sh
@@ -30,6 +30,10 @@
# 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': }
+#
+#
+# WARNING: don't forget to update mw-run-phpunit-allexts.sh as well
+#
PHPUNIT_DIR="/srv/deployment/integration/phpunit/vendor/phpunit/phpunit"
# Setup Junit destination
--
To view, visit https://gerrit.wikimedia.org/r/92623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8eb320ec5c2e9f8332f09c50e06cfed0d7f5fdf
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
