Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/248883
Change subject: Install mw with scriptpath for qunit jobs ...................................................................... Install mw with scriptpath for qunit jobs With MediaWiki core https://gerrit.wikimedia.org/r/248321/ the installer now set: $wgResourceBasePath = $wgScriptPath; The qunit jobs do not override that variable and it thus remains set to '/wiki' which causes some resources to not be reacheable when running the qunit jobs: 404: /wiki/extensions/Thanks/WhiteSmiley.png Make mw-set-env.sh to set the 'localhost' related env variables specially $MW_SCRIPT_PATH. Add to install.php the option --scriptpath="$MW_SCRIPT_PATH". Default to '/wiki'. Bug: T116565 Change-Id: I72c549bde80ab58ba5e278a37878b8578b4e6d95 --- M bin/mw-install-mysql.sh M bin/mw-install-sqlite.sh M bin/mw-set-env.sh 3 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/83/248883/1 diff --git a/bin/mw-install-mysql.sh b/bin/mw-install-mysql.sh index 0ce58c4..12821e1 100755 --- a/bin/mw-install-mysql.sh +++ b/bin/mw-install-mysql.sh @@ -2,6 +2,8 @@ . /srv/deployment/integration/slave-scripts/bin/mw-setup.sh +MW_SCRIPT_PATH=${MW_SCRIPT_PATH:-/wiki} + mysql -u root <<EOS DROP DATABASE IF EXISTS ${MW_DB}; CREATE DATABASE ${MW_DB}; @@ -17,6 +19,7 @@ --dbuser="$MW_DB_USER" \ --dbpass="$MW_DB_PASS" \ --dbname="$MW_DB" \ + --scriptpath="$MW_SCRIPT_PATH" \ --pass testpass \ TestWiki \ WikiAdmin diff --git a/bin/mw-install-sqlite.sh b/bin/mw-install-sqlite.sh index 4fcc187..89ce8f2 100755 --- a/bin/mw-install-sqlite.sh +++ b/bin/mw-install-sqlite.sh @@ -2,6 +2,8 @@ . /srv/deployment/integration/slave-scripts/bin/mw-setup.sh +MW_SCRIPT_PATH=${MW_SCRIPT_PATH:-/wiki} + # Run MediaWiki installer cd "$MW_INSTALL_PATH" php maintenance/install.php \ @@ -9,6 +11,7 @@ --dbtype=sqlite \ --dbpath="$MW_TMPDIR" \ --dbname="$MW_DB" \ + --scriptpath="$MW_SCRIPT_PATH" \ --pass testpass \ TestWiki \ WikiAdmin diff --git a/bin/mw-set-env.sh b/bin/mw-set-env.sh index 78c14f6..95ac155 100755 --- a/bin/mw-set-env.sh +++ b/bin/mw-set-env.sh @@ -2,6 +2,11 @@ . /srv/deployment/integration/slave-scripts/bin/global-set-env.sh +if [[ "$JOB_NAME" == *"-qunit"* ]]; then + . /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh +fi + + # Script to set up various environment variables suitable to test out # MediaWiki core and extensions on Wikimedia continuous integration platform. -- To view, visit https://gerrit.wikimedia.org/r/248883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72c549bde80ab58ba5e278a37878b8578b4e6d95 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
