jenkins-bot has submitted this change and it was merged.
Change subject: Don't use bits for test.wikidata
......................................................................
Don't use bits for test.wikidata
To avoid issues with JS or other resources
when stuff is being tested on mw1017.
Bug: T92949
Change-Id: I55977ece6f557111402751ff00f784182977e404
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Hoo man: Looks good to me, but someone else must approve
Alex Monk: Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d1d777b..32baf6c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -229,6 +229,10 @@
$wgExtensionAssetsPath =
"//{$wmfHostnames['test']}/w/static-$wmfVersionNumber/extensions";
$wgStyleSheetPath =
"//{$wmfHostnames['test']}/w/static-$wmfVersionNumber/skins";
$wgResourceBasePath =
"//{$wmfHostnames['test']}/w/static-$wmfVersionNumber"; // This means resources
will be requested from /w/static-VERSION/resources
+} elseif ( $wgDBname == 'testwikidatawiki' && $wmfRealm === 'production' ) {
+ $wgExtensionAssetsPath =
"//test.wikidata.org/w/static-$wmfVersionNumber/extensions";
+ $wgStyleSheetPath =
"//test.wikidata.org/w/static-$wmfVersionNumber/skins";
+ $wgResourceBasePath = "//test.wikidata.org/w/static-$wmfVersionNumber";
// This means resources will be requested from /w/static-VERSION/resources
} elseif ( $wgDBname == 'labswiki' ) {
$wgExtensionAssetsPath =
"//wikitech.wikimedia.org/w/static-$wmfVersionNumber/extensions";
$wgStyleSheetPath =
"//wikitech.wikimedia.org/w/static-$wmfVersionNumber/skins";
@@ -250,7 +254,7 @@
if ( gethostname() === 'osmium' ) {
$wgResourceLoaderStorageEnabled = false;
-} else if ( !in_array( $wgDBname, array( 'testwiki', 'labswiki' ) ) && isset(
$_SERVER['SERVER_NAME'] ) ) {
+} else if ( !in_array( $wgDBname, array( 'testwiki', 'testwikidatawiki',
'labswiki' ) ) && isset( $_SERVER['SERVER_NAME'] ) ) {
// Make testing JS/skin changes easy by not running load.php through
bits for testwiki
$wgLoadScript =
"//{$wmfHostnames['bits']}/{$_SERVER['SERVER_NAME']}/load.php";
}
--
To view, visit https://gerrit.wikimedia.org/r/197381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55977ece6f557111402751ff00f784182977e404
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
